rpms/udev/devel udev-86a7a2f-fix-missing-firmware.patch, NONE, 1.1 start_udev, 1.86, 1.87 udev-151-rules.patch, 1.1, 1.2 udev.spec, 1.300, 1.301

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21595

Modified Files:
	start_udev udev-151-rules.patch udev.spec 
Added Files:
	udev-86a7a2f-fix-missing-firmware.patch 
Log Message:
* Sun Feb 07 2010 Kyle McMartin <kyle at redhat.com> 151-3
- udev-86a7a2f-fix-missing-firmware.patch: fix hang when loading
  microcode (since microcode_intel tries to probe firmware which does
  not exist. *sigh*)


udev-86a7a2f-fix-missing-firmware.patch:
 firmware.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE udev-86a7a2f-fix-missing-firmware.patch ---
>From 86a7a2f853fe6022c5b0c1b415918047b65533be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
Date: Sun, 31 Jan 2010 13:49:02 +0100
Subject: firmware: fix error reporting on missing firmware files

The new firmware loader does not report an error to the kernel if a firmware file
is missing. This results in modprobe stalling for 60 seconds for each firmware
a module tries to load.
---
 extras/firmware/firmware.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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);
-- 
1.6.6



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- start_udev	12 Nov 2009 09:58:24 -0000	1.86
+++ start_udev	9 Feb 2010 09:59:25 -0000	1.87
@@ -110,7 +110,7 @@ make_extra_nodes () {
 	done
 
 	[ -d /dev/net ] || mkdir -p /dev/net 
-	[ -c /dev/net/tun ] || /bin/mknod -m 0600 /dev/net/tun c 10 200
+	[ -c /dev/net/tun ] || /bin/mknod -m 0666 /dev/net/tun c 10 200
 	#/bin/chown root:root /dev/net/tun
 
 	[ -c /dev/ppp ] || /bin/mknod -m 0600 /dev/ppp c 108 0

udev-151-rules.patch:
 40-redhat.rules |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: udev-151-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-151-rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- udev-151-rules.patch	29 Jan 2010 09:57:03 -0000	1.1
+++ udev-151-rules.patch	9 Feb 2010 09:59:25 -0000	1.2
@@ -22,4 +22,4 @@ index 47ce9e5..aaba82b 100644
  
  KERNEL=="event*", ATTRS{idVendor}=="03f0", ATTRS{interface}=="Virtual Mouse", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="input/hp_ilo_mouse"
 +
-+ACTION=="add", KERNEL=="cpu[0-9]*", RUN+="/bin/bash -c 'echo 1 > /sys/devices/system/cpu/%k/online'"
++ACTION=="add",  SUBSYSTEM=="cpu", KERNEL=="cpu[0-9]*", ATTR{online}="1"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- udev.spec	29 Jan 2010 09:57:03 -0000	1.300
+++ udev.spec	9 Feb 2010 09:59:25 -0000	1.301
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 151
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -14,6 +14,7 @@ Obsoletes: udev-extras < 20090618
 Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 Patch1: udev-151-rules.patch
+Patch2: udev-86a7a2f-fix-missing-firmware.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -110,6 +111,7 @@ glib-based applications using libudev fu
 %prep 
 %setup -q  
 %patch1 -p1
+%patch2 -p1
 
 %build
 # get rid of rpath
@@ -356,6 +358,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Sun Feb 07 2010 Kyle McMartin <kyle at redhat.com> 151-3
+- udev-86a7a2f-fix-missing-firmware.patch: fix hang when loading
+  microcode (since microcode_intel tries to probe firmware which does
+  not exist. *sigh*)
+
 * Fri Jan 29 2010 Harald Hoyer <harald at redhat.com> 151-2
 - fixed rules and startup script (#559844)