rpms/udev/devel udev-089-last_modalias.patch, NONE, 1.1 udev-089-nopie.patch, NONE, 1.1 udev-089.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 start_udev, 1.51, 1.52 udev-rules.patch, 1.11, 1.12 udev.spec, 1.162, 1.163 upstream, 1.4, 1.5

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 13 08:46:46 UTC 2006


Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12981

Modified Files:
	.cvsignore sources start_udev udev-rules.patch udev.spec 
	upstream 
Added Files:
	udev-089-last_modalias.patch udev-089-nopie.patch 
	udev-089.tar.bz2.sign 
Log Message:
- version 089
- do not force loading of parport_pc (bug #186850)
- manually load snd-powermac (bug #176761)
- added usb floppy symlink (bug #185171)
- start_udev uses udevtrigger now instead of udevstart


udev-089-last_modalias.patch:
 udevtrigger.c |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+)

--- NEW FILE udev-089-last_modalias.patch ---
--- udev-089/udevtrigger.c.last_modalias	2006-04-03 14:41:10.000000000 +0200
+++ udev-089/udevtrigger.c	2006-04-13 08:11:59.000000000 +0200
@@ -30,6 +30,7 @@
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <fnmatch.h>
 
 #include "udev.h"
 
@@ -67,10 +68,46 @@
 	NULL
 };
 
+/* list of devices whose modaliases we should run last */
+static char *last_modalias_list[] = {
+	"pci:v*d*sv*sd*bc0Csc03i*",	/* USB controller */
+	"pci:v*d*sv*sd*bc0Csc00i10*",	/* Firewire controller */
+	NULL,
+};
+
+
 LIST_HEAD(device_first_list);
 LIST_HEAD(device_default_list);
 LIST_HEAD(device_last_list);
 
+
+static int modalias_is_greylisted(const char *path)
+{
+
+	char filename[PATH_SIZE];
+	char alias[PATH_SIZE];
+	int fd, i;
+	
+	snprintf(filename,sizeof(filename),"%s/%s/modalias", sysfs_path, path);
+	filename[sizeof(filename)-1] = '\0';
+	
+	fd = open(filename, O_RDONLY);
+	if (fd == -1)
+		return 0;
+	read(fd,alias,PATH_SIZE);
+	alias[sizeof(alias)-1] = '\0';
+	alias[strlen(alias)-1] = '\0';
+	
+	for (i = 0; last_modalias_list[i] != NULL; i++)
+		if (!fnmatch(last_modalias_list[i], alias, 0)) {
+			close(fd);
+			return 1;
+		}
+
+	close(fd);
+	return 0;
+}
+
 static int device_list_insert(const char *path)
 {
 	struct list_head *device_list = &device_default_list;
@@ -87,6 +124,10 @@
 			device_list = &device_last_list;
 			break;
 		}
+		if (modalias_is_greylisted(path)) {
+			device_list = &device_last_list;
+			break;
+		}
 	}
 
 	dbg("add '%s'" , path);

udev-089-nopie.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE udev-089-nopie.patch ---
--- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-12 15:03:07.000000000 +0200
+++ udev-089/extras/volume_id/lib/Makefile	2006-04-12 15:03:19.000000000 +0200
@@ -78,7 +78,7 @@
 
 $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
 	$(E) "  CC      " $@
-	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
+	$(Q) $(LD) -shared -o $@ \
 		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
 		$(addprefix .shlib/,$(OBJS))
 	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)


--- NEW FILE udev-089.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEMVclyGugalF9Dw4RAkuzAJ9u9BKZ86Pv/KLYSK5bJyhXACMCEACdFEjl
e0bVNMtNCImQEiK8abUsIQw=
=Gyt7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	7 Feb 2006 11:06:12 -0000	1.32
+++ .cvsignore	13 Apr 2006 08:46:43 -0000	1.33
@@ -1 +1 @@
-udev-084.tar.bz2
+udev-089.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Feb 2006 11:06:14 -0000	1.32
+++ sources	13 Apr 2006 08:46:43 -0000	1.33
@@ -1 +1 @@
-143b3691ae5e6f96995e5749894f78e4  udev-084.tar.bz2
+ed2d885527da9c5f72abd9a43cb1af98  udev-089.tar.bz2


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- start_udev	21 Feb 2006 19:35:08 -0000	1.51
+++ start_udev	13 Apr 2006 08:46:43 -0000	1.52
@@ -166,7 +166,7 @@
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	/sbin/udevd -d
 	ret=$[$ret + $?]
-	/sbin/udevstart
+	/sbin/udevtrigger
 	ret=$[$ret + $?]
 	wait_for_queue
 	ret=$[$ret + $?]

udev-rules.patch:
 50-udev.rules |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- udev-rules.patch	6 Mar 2006 15:35:13 -0000	1.11
+++ udev-rules.patch	13 Apr 2006 08:46:43 -0000	1.12
@@ -1,318 +1,46 @@
---- udev-084/etc/udev/redhat/hotplug.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/hotplug.rules	2006-03-06 13:55:18.000000000 +0100
-@@ -1,8 +1,15 @@
- # do not call hotplug.d and dev.d for "drivers" and "module" events
--SUBSYSTEM=="drivers",	OPTIONS="last_rule"
--SUBSYSTEM=="module",	OPTIONS="last_rule"
-+SUBSYSTEM=="drivers",   GOTO="hotplug_end"
-+SUBSYSTEM=="module",    GOTO="hotplug_end"
-+ACTION="add",           GOTO="hotplug_comp"
-+ACTION="remove",        GOTO="hotplug_comp"
- 
-+GOTO="hotplug_end"
-+
-+LABEL="hotplug_comp"
- # compatibility support for the obsolete hotplug.d and dev.d directories
--ENV{UDEVD_EVENT}=="1",	RUN+="/lib/udev/udev_run_hotplugd"
-+ENV{UDEVD_EVENT}=="1",  RUN+="/lib/udev/udev_run_hotplugd"
- RUN+="/lib/udev/udev_run_devd"
- 
-+
-+LABEL="hotplug_end"
---- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-03-06 13:55:18.000000000 +0100
-@@ -0,0 +1 @@
-+ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
---- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-03-06 13:55:18.000000000 +0100
-@@ -0,0 +1,9 @@
-+# sysfs is populated after the event is sent
-+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-+
-+# ignore these events until someone needs them
-+SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
-+SUBSYSTEM=="module",		OPTIONS="ignore_device"
-+
-+ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
---- udev-084/etc/udev/redhat/udev.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/udev.rules	2006-03-06 14:56:28.000000000 +0100
-@@ -3,47 +3,52 @@
- #
- # default is OWNER="root" GROUP="root", MODE="0600"
- #
--KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
-+
-+KERNEL=="*", OWNER="root" GROUP="root", MODE="0600"
- 
- # all block devices
- SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
- KERNEL=="root",			GROUP="disk", MODE="0640"
- 
- # console devices
--KERNEL=="tty",			MODE="0666", OPTIONS="last_rule"
--KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
--KERNEL=="tty[0-9]",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="tty[0-9][0-9]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="vc/[0-9]*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
-+KERNEL=="console",              NAME="%k", MODE="0600", OPTIONS="last_rule"
-+KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
- 
- # pty devices
- #  Set this to 0660 if you only want users belonging to tty group
- #  to be able to allocate PTYs
--KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
--KERNEL=="pty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="tty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="pty/m*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
--KERNEL=="vc/s*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
-+KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
-+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
-+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
-+KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
- 
- # serial+dialup devices
--KERNEL=="ttyS*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
--KERNEL=="ttyACM*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
--KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
--KERNEL=="ippp*",		MODE="0660"
--KERNEL=="isdn*",		MODE="0660"
--KERNEL=="isdnctrl*",		MODE="0660"
--KERNEL=="capi*",		MODE="0660"
--KERNEL=="dcbri*",		MODE="0660"
--KERNEL=="ircomm*",		GROUP="uucp", MODE="0660"
--KERNEL=="tts/[0-9]*",		GROUP="uucp", MODE="0660"
--KERNEL=="tts/USB[0-9]*",	GROUP="uucp", MODE="0660"
-+KERNEL=="ippp*",		NAME="%k", MODE="0660"
-+KERNEL=="isdn*",		NAME="%k", MODE="0660"
-+KERNEL=="isdnctrl*",		NAME="%k", MODE="0660"
-+KERNEL=="capi*",		NAME="%k", MODE="0660"
-+KERNEL=="dcbri*",		NAME="%k", MODE="0660"
-+KERNEL=="ircomm*",		NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="tts/[0-9]*",		NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="tts/USB[0-9]*",	NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="tty[A-Z]*",            NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="pppox*",               NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="ircomm*",              NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="modems/mwave*",        NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
-+KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
-+KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
- 
- # vc devices
--KERNEL=="vcs",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcs[0-9]*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcsa",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcsa[0-9]*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
--KERNEL=="vcc/*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-+KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
- 
- # memory devices
- KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
-@@ -54,6 +59,8 @@
- KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
- KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
- KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
-+# 183 = /dev/hwrng        Generic random number generator
-+KERNEL=="hw_random",            NAME="hwrng", SYMLINK+="%k"
- 
- # misc devices
- KERNEL=="nvram",		MODE="0660"
-@@ -61,6 +68,10 @@
- 
- # floppy devices
- KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
-+# fix floppy devices
-+KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
-+KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
-+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
- 
- # audio devices
- KERNEL=="dsp*",			MODE="0660"
-@@ -131,7 +142,7 @@
- # dri devices
- KERNEL=="nvidia*",		MODE="0660"
- KERNEL=="3dfx*",		MODE="0660"
--KERNEL=="dri/*",		MODE="0666"
-+KERNEL=="card[0-9]*",		NAME="dri/%k", MODE="0666"
- 
- # usb devices
- KERNEL=="usb/dabusb*",		MODE="0660"
-@@ -142,16 +153,14 @@
- KERNEL=="z90crypt",		MODE="0666"
- 
- # DVB
--KERNEL=="dvb/*",		MODE="0660"
- KERNEL=="dvb",			MODE="0660"
--KERNEL=="dvb/adapter*",		MODE="0660"
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
-+	NAME="%c", MODE="0660"
- 
- # create a symlink named after the device map name
- # note devmap_name comes with extras/multipath
- #KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
- 
--# DRI devices always go into a subdirectory (as per the LSB spec)
--KERNEL=="card*",		NAME="dri/card%n"
- 
- # alsa devices
- KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-@@ -179,8 +188,8 @@
- BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
- 
- KERNEL=="microcode",		NAME="cpu/%k"
--KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr"
--KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
-+KERNEL=="msr[0-9]*",     	NAME="cpu/%n/msr"
-+KERNEL=="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
- 
- KERNEL=="ram1",			SYMLINK+="ram"
- KERNEL=="video0",		SYMLINK+="video"
-@@ -203,13 +212,12 @@
- KERNEL=="device-mapper",	NAME="mapper/control"
- 
- # old compat symlinks with enumeration
--KERNEL=="sr[0-9]*",		SYMLINK+="cdrom%e"
--KERNEL=="scd[0-9]*",		SYMLINK+="cdrom%e"
--KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom%e"
--KERNEL=="fd[0-9]*",		SYMLINK+="floppy%e"
--KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
--KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
--KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660"
-+KERNEL=="sr[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="scd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-+KERNEL=="fd[0-9]*",		SYMLINK+="floppy-%k"
-+KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
-+KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
- 
- KERNEL=="umad*", 		NAME="infiniband/%k"
- KERNEL=="issm*", 		NAME="infiniband/%k"
-@@ -221,27 +229,30 @@
- KERNEL=="zappseudo",  		NAME="zap/pseudo"
- KERNEL=="zap[0-9]*",  		NAME="zap/%n"
- 
--BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
-+KERNEL=="pktcdvd", NAME="%k/control"
-+
-+
- 
--# do not seperate the next 2 lines!!
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
-+	SYSFS{device/media}=="floppy", \
-+	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
- 
--KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
--KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
-+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
- 
- # rename sr* to scd*
- KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
--KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
-+KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \
-+	OPTIONS+="ignore_remove"
- 
--KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
- 
- #######################################
- # Persistent block device stuff - begin
-@@ -256,7 +267,8 @@
- KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
- 
- # never access removable ide devices, the drivers are causing event loops on open()
--BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
-+BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1",	GOTO="persistent_end"
-+BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
+--- udev-089/etc/udev/redhat/50-udev.rules.rhrules	2006-04-12 15:27:32.000000000 +0200
++++ udev-089/etc/udev/redhat/50-udev.rules	2006-04-12 15:29:35.000000000 +0200
+@@ -271,15 +271,15 @@
+ BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
  
  # by-id (hardware serial number)
- KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
-@@ -297,37 +309,43 @@
- # Persistent block device stuff - end
- #####################################
- 
--ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
-+ACTION=="add", SUBSYSTEM=="usb_device", \
-+	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
-+	NAME="%c", MODE="0644"
- 
-+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
- 
--# Perhaps this should just be for all subsystems?
--
--ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
--ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="*", \
-         RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
- 
--ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \
--	RUN+="/sbin/modprobe $modalias"
-+# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-+# sr:           4 TYPE_WORM, 5 TYPE_ROM
-+# st/osst:      1 TYPE_TAPE
-+# sg: 		8 changer, [36] scanner
-+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", \
-+	RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
-+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", \
-+	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
- 
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
--	RUN+="/sbin/modprobe sd_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
-+
-+ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
- 	RUN+="/sbin/modprobe sd_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \
- 	RUN+="/sbin/modprobe sr_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
-+
-+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \
-+	SYMLINK+="scanner scanner-%k", MODE="0660"
-+
-+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \
-+	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
-+
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
- 	SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
- 	SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="On[sS]tream", \
-+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
- 	RUN+="/sbin/modprobe st"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
--	RUN+="/sbin/modprobe sg"
+-KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
++KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode"
+ KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
+ KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+ 
+ KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/usb_id -x"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -s %p -d $tempnode"
+-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -a -s %p -d $tempnode"
+-KERNEL=="dasd*[!0-9]", IMPORT{program}="/sbin/dasd_id --export $tempnode"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
++KERNEL=="dasd*[!0-9]", IMPORT{program}="/lib/udev/dasd_id --export $tempnode"
+ KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+ 
+ # for partitions import parent information
+@@ -287,19 +287,19 @@
+ KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+ 
+ # by-path (shortest physical path)
+-KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
++KERNEL=="*[!0-9]|sr*", ENV{ID_TYPE}=="?*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+ KERNEL=="sr*", GOTO="persistent_end"
+ KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
+ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+ 
+ # by-label/by-uuid (filesystem properties)
+ KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end"
+-IMPORT{program}="/sbin/vol_id --export $tempnode"
++IMPORT{program}="/lib/udev/vol_id --export $tempnode"
+ ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+ 
+ # BIOS Enhanced Disk Device
+-KERNEL=="*[!0-9]", IMPORT{program}="/sbin/edd_id --export $tempnode"
++KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
+ KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
+ KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
  
--ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
--        RUN+="/sbin/firmware_helper"
-+RUN+="socket:/org/kernel/udev/monitor"
-+


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- udev.spec	8 Mar 2006 10:14:43 -0000	1.162
+++ udev.spec	13 Apr 2006 08:46:43 -0000	1.163
@@ -4,8 +4,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 084
-Release: 13
+Version: 089
+Release: 1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -19,10 +19,12 @@
 
 Patch1: udev-permconv.patch
 Patch2: udev-rules.patch
-Patch3: udevstart2.patch
+#Patch3: udevstart2.patch
 Patch4: udev-084-floppy.patch
 Patch5: udev-extras.patch
 Patch6: udev-084-pg.patch
+Patch7: udev-089-nopie.patch
+Patch8: udev-089-last_modalias.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -44,10 +46,12 @@
 %setup -q  
 %patch1 -p1 -b .rhpermconv
 %patch2 -p1 -b .rhrules
-%patch3 -p1 -b .rhudevstart
+#%patch3 -p1 -b .rhudevstart
 %patch4 -p1 -b .rhfloppy
 %patch5 -p1 -b .rhextras
 %patch6 -p1 -b .pg
+%patch7 -p1 -b .nopie
+%patch8 -p1 -b .last_modalias
 
 %build
 
@@ -64,6 +68,7 @@
         extras/ata_id \
         extras/usb_id \
         extras/edd_id \
+        extras/path_id \
         extras/volume_id \
 %ifarch s390 s390x
         extras/dasd_id \
@@ -74,12 +79,14 @@
 mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
 mv extras/ata_id/ata_id extras/ata_id/ata_id.static
 mv extras/edd_id/edd_id extras/edd_id/edd_id.static
+mv extras/path_id/path_id extras/path_id/path_id.static
 %ifarch s390 s390x
 	mv extras/dasd_id/dasd_id extras/dasd_id/dasd_id.static
 %endif
 mv extras/usb_id/usb_id extras/usb_id/usb_id.static
 mv extras/volume_id/vol_id extras/volume_id/vol_id.static
 make clean
+make E='@echo' Q='@' -C extras/volume_id/lib clean
 
 make CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
         USE_KLIBC=false \
@@ -111,11 +118,13 @@
 mv extras/scsi_id/scsi_id.static extras/scsi_id/scsi_id
 mv extras/ata_id/ata_id.static extras/ata_id/ata_id
 mv extras/edd_id/edd_id.static extras/edd_id/edd_id
+mv extras/path_id/path_id.static extras/path_id/path_id
 %ifarch s390 s390x
 	mv extras/dasd_id/dasd_id.static extras/dasd_id/dasd_id
 %endif
 mv extras/usb_id/usb_id.static extras/usb_id/usb_id
 mv extras/volume_id/vol_id.static extras/volume_id/vol_id
+touch extras/volume_id/vol_id
 
 make DESTDIR=$RPM_BUILD_ROOT install \
 	EXTRAS="	\
@@ -123,6 +132,7 @@
         extras/ata_id \
 	extras/usb_id \
 	extras/edd_id \
+	extras/path_id \
 	extras/volume_id \
 %ifarch s390 s390x
 	extras/dasd_id \
@@ -140,10 +150,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
 
 install -m 0644 etc/udev/redhat/05-udev-early.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-udev-early.rules
-install -m 0644 etc/udev/redhat/udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
+install -m 0644 etc/udev/redhat/50-udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
 install -m 0644 etc/udev/redhat/95-pam-console.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/95-pam-console.rules
 # Backwards compat
-install -m 0644 etc/udev/redhat/hotplug.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-hotplug.rules
+install -m 0644 etc/udev/redhat/51-hotplug.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-hotplug.rules
 
 install -m 0644 etc/udev/udev.conf $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 
@@ -162,19 +172,27 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
-install -m 0644 extras/path_id $RPM_BUILD_ROOT/sbin/path_id
+#install -m 0644 extras/path_id/path_id $RPM_BUILD_ROOT/sbin/path_id
 install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
-install -m 0755 udevstart $RPM_BUILD_ROOT/sbin
+#install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin
 install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
 
 
 mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
 
+pushd $RPM_BUILD_ROOT
+rm -f usr/include/libvolume_id.h \
+   usr/lib*/libvolume_id.a \
+   usr/lib*/libvolume_id.so \
+   usr/lib*/pkgconfig/libvolume_id.pc \
+   lib*/libvolume_id.*
+popd
+
 # short-term workaround
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
 #!/bin/sh
-for i in nvram floppy parport_pc parport lp;do
+for i in nvram floppy parport lp snd-powermac;do
         modprobe \$i >/dev/null 2>&1
 done
 EOF
@@ -222,26 +240,28 @@
 %files
 %defattr(-,root,root)
 %doc COPYING README TODO ChangeLog RELEASE-NOTES docs/* 
-%doc etc/udev/redhat/udev.rules
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevcontrol
 %attr(0755,root,root) /sbin/udevd
-%attr(0755,root,root) /sbin/udevstart
+%attr(0755,root,root) /sbin/udevtrigger
 %attr(0755,root,root) /sbin/start_udev
 #%attr(755,root,root) /sbin/udev_volume_id
 %attr(0755,root,root) %{udev_scriptdir}/udev_run_devd
 %attr(0755,root,root) %{udev_scriptdir}/udev_run_hotplugd
 %attr(755,root,root) /sbin/scsi_id
-%attr(755,root,root) /sbin/ata_id
-%attr(755,root,root) /sbin/edd_id
-%attr(755,root,root) /sbin/usb_id
-%attr(755,root,root) /sbin/vol_id
-%attr(755,root,root) /sbin/path_id
+%attr(755,root,root) %{udev_scriptdir}/scsi_id
+%attr(755,root,root) %{udev_scriptdir}/ata_id
+%attr(755,root,root) %{udev_scriptdir}/edd_id
+%attr(755,root,root) %{udev_scriptdir}/usb_id
+%attr(755,root,root) %{udev_scriptdir}/vol_id
+%attr(755,root,root) %{udev_scriptdir}/path_id
 %ifarch s390 s390x
-%attr(755,root,root) /sbin/dasd_id
+%attr(755,root,root) %{udev_scriptdir}/dasd_id
 %attr(0644,root,root) %{_mandir}/man8/dasd_id*.8*
 %endif
 %attr(755,root,root) /sbin/firmware_helper
+#%attr(0755,root,root) /%{_lib}/libvolume_id.so.0
+#%attr(0755,root,root) /%{_lib}/libvolume_id.so.0.61.0
 
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
@@ -285,6 +305,13 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Thu Apr 13 2006 Harald Hoyer <harald at redhat.com> - 089-1
+- version 089
+- do not force loading of parport_pc (bug #186850)
+- manually load snd-powermac (bug #176761)
+- added usb floppy symlink (bug #185171)
+- start_udev uses udevtrigger now instead of udevstart
+
 * Wed Mar 08 2006 Harald Hoyer <harald at redhat.com> - 084-13
 - fixed pam_console rules (#182600)
 


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream	7 Feb 2006 11:06:20 -0000	1.4
+++ upstream	13 Apr 2006 08:46:43 -0000	1.5
@@ -1 +1 @@
-udev-084.tar.bz2
+udev-089.tar.bz2




More information about the fedora-cvs-commits mailing list