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

(Portage version: 2.1.7.17/cvs/Linux x86_64)

4 files changed, 47 insertions, 3 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/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