Add patch to resolve issue with firmware built-in, bug 463604.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 107 insertions, 20 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 48dbb720c743..6b09db1b2e73 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.101 2013/03/27 07:54:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.102 2013/03/28 22:57:21 floppym Exp $
+
+  28 Mar 2013; Mike Gilbert <floppym@gentoo.org> +files/199-firmware.patch,
+  systemd-199.ebuild:
+  Add patch to resolve issue with firmware built-in, bug 463604.
 
 *systemd-199 (27 Mar 2013)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 66b353608040..0745a9b64ffb 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,6 +8,7 @@ AUX 197-0001-Disable-udev-targets.patch 1774 SHA256 a805ec4051dfcd0271cefe99f8cf
 AUX 198-0001-Disable-udev-targets.patch 3474 SHA256 8b9131ae92ff71bbc447b6756d3bdb8de6586793553bd98a010d2d66840b601a SHA512 8c9cfdca5a4a8884421f270daf2b7b4177fff95b499e562a85028d7f621afb38bc5f8f7f14dba2a73da5f03749a23eaab58c035fded3a4a88d641b96ec307f8f WHIRLPOOL 3c4b929c877813a3b22d4aa9b806af919f7774edc2b56b9704a57fb076ca5dc09be4500b10cdb00a2d33dcebc0d754a1143d5a348896952f2b99a2ceb3c13dff
 AUX 198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch 1349 SHA256 2ea10b9319d1da6b7007553df1b6f09970a373f52a5cff4e4eb77e63144d949b SHA512 1c14e0d48e8514afd3b48ef83dbb6bd75138c858115ab1594cbb210056f39bfdf80f893550612c9d7814b0e0c2ac33d3f6f1e889acaf4b353b93e625fbaa96bb WHIRLPOOL e2026b203635e64ebdc076a59794bafce62852970afdd32fc4e23217d1590dc787b8f3110988d41286130e5b5a0d0e21bef27ec9a29686f9a3449cf830c59b04
 AUX 198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch 1348 SHA256 4e2af402378285300175a969d265a8653cfea21cc4c5c2bf1a67f53aafaf6185 SHA512 deb3fdc316a130663a1d4edba713715d6f907ddc42709f2605c8f086261c54583175873e08a30d0d8741a6f79fcb21b1d4bf5b75cce0880d246a306664b24db4 WHIRLPOOL b3fc0a02ccf2ce48072f07238cc45161822fa8a1d6ca32e92ae0578068870a729e78f11aad7b5bd17f52335f589310bd8040eb717a1237e3828212fe39a1dd56
+AUX 199-firmware.patch 2646 SHA256 2c0469f2709eb0fccc92b0f254d3c3b9e70eabb22b4651ed4210c4c5a80561c1 SHA512 49073a2c941d4b4a2fa643fbf9f41e72bb13f02233d22301f636bf5873850c39a7ecd22f96184863de4a05bd5aad1d3fd846ccad1f900bb977ab2057e99e7141 WHIRLPOOL 2995271c4ac55fe7a0ede89dfa06ee0e4917b9ab25af45440ca9d2a49bfba1ee8fdfc98e1ee89ab0401af91d6eddf971d59fdd0a1039ea4aab7fe496bbc6e975
 AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed
 AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa8ec2aafc22868a SHA512 8a4d72c63794676a01db2792b44fa39ec4ea80db97f2b54904f5b118a776c08721d360f8bb2ed15da12e922dbac3f2a431d6a6f98831bef3520d781d97d665db WHIRLPOOL e83955a1d86400ee16d35d61eaa35fb3050af2b2805a2049c37a602be1bd60233caaa1cadbbd4a3b3e425a44629c9cac921a5c4b2fca9003a45e49b89298ca50
 AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01
@@ -17,26 +18,14 @@ DIST systemd-199.tar.xz 2101604 SHA256 8c4462a04f3ecf7f083782e5e0687913b1d33c644
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-198-r5.ebuild 7203 SHA256 e919cc434b34107294156166236558170d093db7633adcb9664403b8e975cf2a SHA512 8b20498ad093a387fffc0b338fd4a48441ee38bce903e6ee41c919b4b8d9eee4b2b157aee376f880396fd5dfd01702785db50cd13ff6c11dfee82ee6fe42a850 WHIRLPOOL 7c8409b9c0ea08bc9d1021267cd0613df49d8aaa16399711e87bf6c7d30f2de4d29592ef57c6bf4d23146edbdf73231bb809176181cfc5bed489cc42dfb1e461
-EBUILD systemd-199.ebuild 6698 SHA256 8a6473fbb1938b27ac61720b31bcd62bb40f1da770776fe6bb240ae74fd87ce1 SHA512 e7bd6b32226e521e22ebac7ca4fd30fab97ed62709bf96d0ec6d49df1987efc6ef940b49dc767315768b2d71b1b75a135b81a206531f122226aaf21e45fcf72b WHIRLPOOL 733d9efe5f9c93d4258a3c1c40f6880a028a34ae1e782e4eeb547a52d6f5e6e687f9fa5d2400d322b8c00c0f36f36e8fe06edeee09c08d57a189708c297d86a2
+EBUILD systemd-199.ebuild 6753 SHA256 f53bc401651e6122c65f1020de00fb2755e789295a3d37aff052ab9706aeeafb SHA512 c0ee0301c938fa125b24092dd8f5eb9c7e360b456e0b7350da472d4d6c05bd41106b4fcdcecf8d2fc2178d3e769ba95f38f1a0239dc8ac140c965eea7c9ade8f WHIRLPOOL e0de214346b828d95bf49d3841099e7c1a25d0fe16ca2e429a709cf149af4eb082ee7b6ba03d51e83f81bfbf6d9e9e1dbee00d964cf20f5c2358ac0ddbd952d6
 EBUILD systemd-9999.ebuild 7328 SHA256 bdde88448fe5980cebccf76325f8675185af1e44fe74d3e06fcba039027d381e SHA512 aba2fe9724386f90d37e3f0721e8e3be2d11d6e4b9b069bd82882fa362046c98c7cadd51cafc2e5f3d12425b1bfb24dce9194528fd28ae287a69cd680ed1cfb2 WHIRLPOOL 7813e22bcb1ccf22767575973372fb4f27133271d09b69dd4065e5bbdd4a8eee51084fd5208b46dcd13a1a241d9d32c52ac8ebf0712fdd692e568b98d5768b0a
-MISC ChangeLog 19758 SHA256 834ba9dc7f17e9df748b28f0dde98e8abaeb6a7176df5ab3eeea7ca3d1457b62 SHA512 2fa87a952775244bfef704d433a446b5b447255270ff1c3d65bc7b3edcd03a1ab07a3f70324522a1ba47a3d7b6a4da6a330168c99235b7c9f8cd79f134b3f144 WHIRLPOOL a595b56a4a0432a21f2e22c03b11f657372f9ef97e56d3c2a9938b83f0240e59085c69ee6edd6b02496056417c719c9f602947446021e01db2cb3892c3aca3a3
+MISC ChangeLog 19923 SHA256 665b26ecd041a76b7485cf736c57d3dd80740e26424bee28acbef27dd3740c15 SHA512 52c2b79068dddc59adfd5a86a97254458c66053fd978c4b8f97776bf917ec365e2d8d838334706a0c580296427c80f54fa46dbea8a2a4d1c6d0ed5723ae8e223 WHIRLPOOL 59afdb55b1a977de0d0df8007e786952b105021ae0245b5cd1860cd461b505c8460e3ecaea17ea61731869490a93017fc1596dea0e3f675b8cd68610d5dc2c10
 MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRUqXqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDUp0P+wfXDeVNbxeTqHKQZuEFk8aK
-Yw2hcZbOi48VAsZDvYriQXernZGsndqP6/TXrf5+NNQiZ8VILofuHds+hwQ2GFZR
-dZqLUs//uVCPp5isHqmhVeQ/3D8eLy28MElglKqCaNXQkERhN+pPE4/FdJt2l0Rk
-xLPMfZ0FP2cv/VZ6kgkND6wCs/6b4ZqartBRs4731GDOV1kJ6XF1NGgaeApnwZn1
-xK1sqH1c+cKkjeTJ1pcLTsNj1gEIg/mdsEnTVrrYVzgPmJecb2Tu34YrTLWoTfIH
-gQESz6T2UeUU3Bn0v1shXL+DhpM/3FZD+kJM8lu1LzGNBdzr1++xs3OjIucgNtcR
-0qpXQ3bqnbjRxmI7qdGx3vng5jkcJ8f/dn/ibMQdmYnXL6qjbl1uElDzsI1B2dku
-K7BwpFg0AQzjM8MiEEEPvDRkzm/w0HZypCtA99uj3Q7eEp98MZ0E5eSSXdSOsSwH
-8f/pkZdubPZItsEECyRrC9w5RBPJ3EMklE0Zmv9N903TelVkHNvnp9zb4Zcy9LWR
-FhBRjICiBAvI9dICj+gEd1ZEpj5JK4VXzGLXdFBePo8CZWGCl3F2eWZ2jyy0lo1+
-CG2u8l/5YtgjY2vDztidUh7nL9CHn4cwbaY188u+Sc7yQO718Ya1QFFfxtaJUId4
-7VGwdlti5tfRWDmqVBxs
-=l95C
+iF4EAREIAAYFAlFUytIACgkQC77qH+pIQ6Tz2AD/TkYSqW03CzLXNBubLmnrpo8g
+nny7AjZFBk1Xz3oCJRQA/jWjDcrnO3nYHPixzE0E/ibUgHL7fCUoop4kQvxwiblU
+=1KZL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/files/199-firmware.patch b/sys-apps/systemd/files/199-firmware.patch
new file mode 100644
index 000000000000..b62af973c481
--- /dev/null
+++ b/sys-apps/systemd/files/199-firmware.patch
@@ -0,0 +1,92 @@
+This is same as upstream commit:
+
+http://cgit.freedesktop.org/systemd/systemd/commit/?id=d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff
+
+Except we patch configure and config.h.in to avoid autotools.
+
+--- src/udev/udev-builtin.c
++++ src/udev/udev-builtin.c
+@@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = {
+         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+ #endif
+         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
+-#ifdef ENABLE_FIRMWARE
++#ifdef HAVE_FIRMWARE
+         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+ #endif
+         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
+--- src/udev/udev.h
++++ src/udev/udev.h
+@@ -140,7 +140,7 @@ enum udev_builtin_cmd {
+         UDEV_BUILTIN_BLKID,
+ #endif
+         UDEV_BUILTIN_BTRFS,
+-#ifdef ENABLE_FIRMWARE
++#ifdef HAVE_FIRMWARE
+         UDEV_BUILTIN_FIRMWARE,
+ #endif
+         UDEV_BUILTIN_HWDB,
+@@ -169,7 +169,7 @@ struct udev_builtin {
+ extern const struct udev_builtin udev_builtin_blkid;
+ #endif
+ extern const struct udev_builtin udev_builtin_btrfs;
+-#ifdef ENABLE_FIRMWARE
++#ifdef HAVE_FIRMWARE
+ extern const struct udev_builtin udev_builtin_firmware;
+ #endif
+ extern const struct udev_builtin udev_builtin_hwdb;
+--- src/udev/udevd.c
++++ src/udev/udevd.c
+@@ -98,7 +98,7 @@ struct event {
+         dev_t devnum;
+         int ifindex;
+         bool is_block;
+-#ifdef ENABLE_FIRMWARE
++#ifdef HAVE_FIRMWARE
+         bool nodelay;
+ #endif
+ };
+@@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev)
+         event->devnum = udev_device_get_devnum(dev);
+         event->is_block = streq("block", udev_device_get_subsystem(dev));
+         event->ifindex = udev_device_get_ifindex(dev);
+-#ifdef ENABLE_FIRMWARE
++#ifdef HAVE_FIRMWARE
+         if (streq(udev_device_get_subsystem(dev), "firmware"))
+                 event->nodelay = true;
+ #endif
+@@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event)
+                         return true;
+                 }
+ 
+-#ifdef ENABLE_FIRMWARE
++#ifdef HAVE_FIRMWARE
+                 /* allow to bypass the dependency tracking */
+                 if (event->nodelay)
+                         continue;
+--- configure
++++ configure
+@@ -18066,6 +18099,11 @@
+ done
+ IFS=$OLD_IFS
+ 
++if test "x${FIRMWARE_PATH}" != "x"; then :
++
++$as_echo "#define HAVE_FIRMWARE 1" >>confdefs.h
++
++fi
+  if test "x${FIRMWARE_PATH}" != "x"; then
+   ENABLE_FIRMWARE_TRUE=
+   ENABLE_FIRMWARE_FALSE='#'
+--- config.h.in
++++ config.h.in
+@@ -57,6 +57,9 @@
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+ 
++/* Define if FIRMWARE is available */
++#undef HAVE_FIRMWARE
++
+ /* GCRYPT available */
+ #undef HAVE_GCRYPT
+ 
diff --git a/sys-apps/systemd/systemd-199.ebuild b/sys-apps/systemd/systemd-199.ebuild
index 5f069266fc6e..1217d1b7f2eb 100644
--- a/sys-apps/systemd/systemd-199.ebuild
+++ b/sys-apps/systemd/systemd-199.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-199.ebuild,v 1.1 2013/03/27 07:54:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-199.ebuild,v 1.2 2013/03/28 22:57:21 floppym Exp $
 
 EAPI=5
 
@@ -64,7 +64,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( >=dev-util/gtk-doc-1.18 )"
 
 src_prepare() {
-
+	local PATCHES=(
+		"${FILESDIR}/199-firmware.patch"
+	)
 	autotools-utils_src_prepare
 }