Fix missing firmware timeout, to stop modprobe from waiting 60s for no file stretching boot very long, Bug #301667.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

5 files changed, 54 insertions, 9 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 446bcf77150e..e2a646bcc4e2 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.524 2010/01/31 21:38:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.525 2010/02/01 20:53:59 zzam Exp $
+
+*udev-151-r1 (01 Feb 2010)
+*udev-150-r1 (01 Feb 2010)
+
+  01 Feb 2010; Matthias Schwarzott <zzam@gentoo.org> -udev-150.ebuild,
+  +udev-150-r1.ebuild, +files/udev-150-fix-missing-firmware-timeout.diff,
+  -udev-151.ebuild, +udev-151-r1.ebuild:
+  Fix missing firmware timeout, to stop modprobe from waiting 60s for no
+  file stretching boot very long, Bug #301667.
 
   31 Jan 2010; Matthias Schwarzott <zzam@gentoo.org> udev-151.ebuild:
   Fix install error, bug #302903. Removed old code for multilib-installs.
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3f107df46233..38337c8269cf 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -47,6 +47,7 @@ AUX udev-124-encoding-overflow.patch 326 RMD160 8f08aa593d93451d67bdbfe0b9ea2d59
 AUX udev-124-netlink-owner-check.patch 1162 RMD160 420a22a2762930479df5c7b609931685bba29a6c SHA1 0fbdd35ad860e9b09d141735757fad0319bd08b3 SHA256 c2354e23c451883ab1597603467caf24e0a6893af4d8a3b86aee2ba98917a45e
 AUX udev-141-remove-devfs-names.diff 557 RMD160 c8dbcb0dcc815d78b9f33a6b49290cf21f2b7eee SHA1 5167dc1227e2f07664fad66a24365af192c8ab14 SHA256 9d1d64b41a6ff423fb218a36c56cbdec2d79827741060f39aed2f8ce2d03693f
 AUX udev-146-printer-usb_device-permission.diff 1419 RMD160 64afbfbf7d8756112ad830d6bc95d7c6c07e1a58 SHA1 4e6140ef8a6bf639384f1105158adaacf31196dd SHA256 b6b4dc88433703a18d07bc90d74afe7a20786ef7350e89d56f31e5ee5ace8238
+AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf0399ecf326dc5f975719c SHA1 379bdb522edc45a9d9ed748be84f9087bee5b438 SHA256 863f394783ac282a3d83eb84ff0ed0f5dd7982e1b40d10e1081c567f38825371
 AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c
 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
@@ -95,15 +96,15 @@ EBUILD udev-146-r2.ebuild 16310 RMD160 3c74cbbc9c076a5e8797b269ee797dcfdce03d94
 EBUILD udev-146.ebuild 15340 RMD160 c8d21097010f25b86c50cd128a2e1267e99a362e SHA1 f5952c3d427f3ecc5743c1f182e59436adbf4a49 SHA256 f9dc772c66c3ff290eac75d3d95e57ff195cc31a418f818ecbc371171097d3bd
 EBUILD udev-147-r1.ebuild 16431 RMD160 5b3b1442e8ea905148715fbdea52d075ac406b5f SHA1 89e6e05c1538ff17ff063b18d0c2079921d56231 SHA256 790d1b6cd3f9a41bc2abbf41c9d9ee0ddd848b8d95e900d160533925c91eed79
 EBUILD udev-149.ebuild 16339 RMD160 8440f56ff99a63c81661991e8f018a1dcd259901 SHA1 89b0efaa3c4d8ffc7bf36cbc0c1d6585ea235293 SHA256 b0f68758706a5ed355a758fe7106397ab45b8980bf5b3253e20223edde396ee4
-EBUILD udev-150.ebuild 16340 RMD160 38d9d8a4a7e56c17c55ba8a7cb773a637e0ca6b7 SHA1 3625a6f0587abac24e189fd92c7fd0501f6592d3 SHA256 6b04584523f2135317a58fb4329193e8ce9979b4a7b1b7275eb7d7381d4d02eb
-EBUILD udev-151.ebuild 16213 RMD160 6cd54e092644c991b4c703393b93e2e5e9b23ce4 SHA1 8d316281b7e4b0ba47aa7c6f882666c7f904d39c SHA256 1eb53d5d90af431a381a44786d12ecc250712e74a7ba83dffeb5f3c6b39c082d
+EBUILD udev-150-r1.ebuild 16423 RMD160 60e121a3ff3d86e3799c0399bfc6adedcdf788de SHA1 798534df33472f3fc30b90fe1d68a5028f874190 SHA256 4092bcc23b845433c747b4a2be3599402a9c21ff6443e1d7a2b1ad2ef8ef6d97
+EBUILD udev-151-r1.ebuild 16296 RMD160 34261a024013dfec080f7de0deb810722c01e437 SHA1 0436546c9c9f7464498d1a2976367b0a22550d10 SHA256 71f83dbca263f1eaadbb34c0ed81b6bd095d25cc91953619887123bcc2bbee22
 EBUILD udev-9999.ebuild 16066 RMD160 cb8fb45c578a30dbbf7a9b242f57cbec2f187f30 SHA1 49578cfd34a3f533d143281be59174e632108b34 SHA256 f0dea7ca8d0f266ec935fee2644cecbbb0652f3e61a2cba675e13c903c83b89f
-MISC ChangeLog 106729 RMD160 1877e75f622e7db1f3e9c4ad550f2e14409c3fae SHA1 1afb63db36ed1363f0b83fa5d5f45c63107f8b8c SHA256 9f445d327fbfe4830b13e99319f141d4f33b737738ea42130fa2830c0456f9f7
+MISC ChangeLog 107091 RMD160 5c5877539e50255a4206314e6c4e2eb0cb838f85 SHA1 f9224a9f4ef7d32aebc7f0593fa5d4304c8ab937 SHA256 f3aad7111333cbbb74f56e303dcf51f3761b5bcedbd89cacc235514a66416827
 MISC metadata.xml 502 RMD160 f353faee03dd5920d1f7d65c123d93e018c7be53 SHA1 02c5eb9fd660e69127fa84487e0d70b85ee1d3cc SHA256 ca6a239a7be7949fdf1461eb524ca9234a0fd2aee9fc7eeb758a2347b6031664
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktl+JoACgkQt2vP6XvVdOfhNgCgsFHuvUULbqWnULE3K05HvxDh
-/gwAoK5b/eFo7aKR3tnxyUbarCKIVQEY
-=hExv
+iEYEARECAAYFAktnP2MACgkQt2vP6XvVdOfjSQCg2JwPtmNtHaGDBj5NQ82i4ZJZ
+P1YAnjacBeaeRav9/qH210po5mywmbAb
+=5yvr
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff b/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff
new file mode 100644
index 000000000000..7690f6b39af9
--- /dev/null
+++ b/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff
@@ -0,0 +1,29 @@
+diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c
+index 8f70be4..16455de 100644
+--- a/extras/firmware/firmware.c
++++ b/extras/firmware/firmware.c
+@@ -149,6 +149,7 @@ int main(int argc, char **argv)
+
+ 	util_path_encode(firmware, fwencpath, sizeof(fwencpath));
+ 	util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL);
++	util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
+
+ 	if (fwfile == NULL) {
+ 		int err;
+@@ -166,6 +167,7 @@ int main(int argc, char **argv)
+ 			udev_selinux_resetfscreatecon(udev);
+ 		} while (err == -ENOENT);
+ 		rc = 2;
++		set_loading(udev, loadpath, "-1");
+ 		goto exit;
+ 	}
+
+@@ -176,7 +178,6 @@ int main(int argc, char **argv)
+ 	if (unlink(misspath) == 0)
+ 		util_delete_path(udev, misspath);
+
+-	util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
+ 	set_loading(udev, loadpath, "1");
+
+ 	util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL);
+
diff --git a/sys-fs/udev/udev-150.ebuild b/sys-fs/udev/udev-150-r1.ebuild
index c2a86d6a6128..f8c5fd6719c5 100644
--- a/sys-fs/udev/udev-150.ebuild
+++ b/sys-fs/udev/udev-150-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-150.ebuild,v 1.1 2010/01/19 22:12:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-150-r1.ebuild,v 1.1 2010/02/01 20:53:59 zzam Exp $
 
 EAPI="1"
 
@@ -140,6 +140,9 @@ src_unpack() {
 	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
 	        EPATCH_FORCE="yes" epatch
 
+	# Bug 301667
+	epatch "${FILESDIR}"/udev-150-fix-missing-firmware-timeout.diff
+
 	if ! use devfs-compat; then
 		# see Bug #269359
 		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
diff --git a/sys-fs/udev/udev-151.ebuild b/sys-fs/udev/udev-151-r1.ebuild
index dcda6cfd54ce..82b1c5a91c53 100644
--- a/sys-fs/udev/udev-151.ebuild
+++ b/sys-fs/udev/udev-151-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151.ebuild,v 1.2 2010/01/31 21:38:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r1.ebuild,v 1.1 2010/02/01 20:53:59 zzam Exp $
 
 EAPI="1"
 
@@ -143,6 +143,9 @@ src_unpack() {
 	  	      EPATCH_FORCE="yes" epatch
 	fi
 
+	# Bug 301667
+	epatch "${FILESDIR}"/udev-150-fix-missing-firmware-timeout.diff
+
 	if ! use devfs-compat; then
 		# see Bug #269359
 		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff