rpms/udev/devel udev-078-redhat.patch, 1.5, 1.6 udev.spec, 1.141, 1.142
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 26 08:12:21 UTC 2006
- Previous message (by thread): rpms/evolution-data-server/devel .cvsignore, 1.36, 1.37 evolution-data-server.spec, 1.79, 1.80 sources, 1.36, 1.37
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.120.ooo52428.execshield.bridges.patch, 1.1, 1.2 openoffice.org.spec, 1.609, 1.610
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3657
Modified Files:
udev-078-redhat.patch udev.spec
Log Message:
- changed usb device naming
udev-078-redhat.patch:
etc/udev/redhat/05-udev-early.rules | 8 +
etc/udev/redhat/hotplug.rules | 13 ++
etc/udev/redhat/udev.rules | 98 +++++++++++----------
extras/check-cdrom.sh | 39 ++++++++
extras/floppy/create_floppy_devices.c | 6 +
extras/ide-media.sh | 7 +
extras/load_floppy_module.sh | 35 +++++++
extras/run_directory/MAKEDEV.dev | 38 ++++++++
extras/run_directory/dev.d/default/pam_console.dev | 18 ---
extras/udevpermconv.sh | 94 ++++++++++++++++++++
10 files changed, 292 insertions(+), 64 deletions(-)
Index: udev-078-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udev-078-redhat.patch 24 Jan 2006 12:37:12 -0000 1.5
+++ udev-078-redhat.patch 26 Jan 2006 08:12:17 -0000 1.6
@@ -1,5 +1,5 @@
--- udev-078/etc/udev/redhat/udev.rules.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/etc/udev/redhat/udev.rules 2006-01-24 12:48:17.000000000 +0100
++++ udev-078/etc/udev/redhat/udev.rules 2006-01-26 08:40:10.000000000 +0100
@@ -3,6 +3,7 @@
#
# default is OWNER="root" GROUP="root", MODE="0600"
@@ -142,8 +142,13 @@
#######################################
# Persistent block device stuff - begin
-@@ -301,19 +313,11 @@
+@@ -297,23 +309,14 @@
+ # 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"
# Perhaps this should just be for all subsystems?
+ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias"
@@ -163,15 +168,15 @@
ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
RUN+="/sbin/modprobe sd_mod"
ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
-@@ -331,3 +335,6 @@
+@@ -331,3 +334,6 @@
ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
RUN+="/sbin/firmware_helper"
+
+RUN+="socket:/org/kernel/udev/monitor"
+
---- udev-078/etc/udev/redhat/05-udev-early.rules.redhat 2006-01-24 12:47:48.000000000 +0100
-+++ udev-078/etc/udev/redhat/05-udev-early.rules 2006-01-24 12:47:41.000000000 +0100
+--- /dev/null 2006-01-25 15:42:12.582274750 +0100
++++ udev-078/etc/udev/redhat/05-udev-early.rules 2006-01-26 08:39:21.000000000 +0100
@@ -0,0 +1,8 @@
+# sysfs is populated after the event is sent
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
@@ -182,7 +187,7 @@
+SUBSYSTEM=="module", OPTIONS="ignore_device"
+
--- udev-078/etc/udev/redhat/hotplug.rules.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/etc/udev/redhat/hotplug.rules 2006-01-23 11:21:53.000000000 +0100
++++ udev-078/etc/udev/redhat/hotplug.rules 2006-01-26 08:39:21.000000000 +0100
@@ -1,8 +1,15 @@
# do not call hotplug.d and dev.d for "drivers" and "module" events
-SUBSYSTEM=="drivers", OPTIONS="last_rule"
@@ -202,8 +207,8 @@
+
+LABEL="hotplug_end"
---- /dev/null 2006-01-20 06:37:43.888693712 +0100
-+++ udev-078/extras/ide-media.sh 2006-01-23 11:21:53.000000000 +0100
+--- /dev/null 2006-01-25 15:42:12.582274750 +0100
++++ udev-078/extras/ide-media.sh 2006-01-26 08:39:21.000000000 +0100
@@ -0,0 +1,7 @@
+#!/bin/bash
+i=0
@@ -212,8 +217,8 @@
+ i=$[i+1];
+done
+/bin/cat /proc/ide/$1/media
---- /dev/null 2006-01-20 06:37:43.888693712 +0100
-+++ udev-078/extras/run_directory/MAKEDEV.dev 2006-01-23 11:21:53.000000000 +0100
+--- /dev/null 2006-01-25 15:42:12.582274750 +0100
++++ udev-078/extras/run_directory/MAKEDEV.dev 2006-01-26 08:39:21.000000000 +0100
@@ -0,0 +1,38 @@
+#!/bin/sh
+
@@ -254,7 +259,7 @@
+ /sbin/pam_console_apply $DEVNAME*
+fi
--- udev-078/extras/run_directory/dev.d/default/pam_console.dev.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2006-01-23 11:21:53.000000000 +0100
++++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2006-01-26 08:39:21.000000000 +0100
@@ -1,16 +1,11 @@
#!/bin/sh
@@ -296,8 +301,8 @@
+ debug_mesg "Restoring console permissions for $DEVNAME $DEVLINKS"
+ /sbin/pam_console_apply "$DEVNAME" $DEVLINKS
fi
---- /dev/null 2006-01-20 06:37:43.888693712 +0100
-+++ udev-078/extras/check-cdrom.sh 2006-01-23 11:21:53.000000000 +0100
+--- /dev/null 2006-01-25 15:42:12.582274750 +0100
++++ udev-078/extras/check-cdrom.sh 2006-01-26 08:39:21.000000000 +0100
@@ -0,0 +1,39 @@
+#!/bin/bash
+
@@ -338,8 +343,8 @@
+ done
+ exit 1
+}
---- /dev/null 2006-01-20 06:37:43.888693712 +0100
-+++ udev-078/extras/udevpermconv.sh 2006-01-23 11:21:53.000000000 +0100
+--- /dev/null 2006-01-25 15:42:12.582274750 +0100
++++ udev-078/extras/udevpermconv.sh 2006-01-26 08:39:21.000000000 +0100
@@ -0,0 +1,94 @@
+#!/bin/bash
+#
@@ -435,8 +440,8 @@
+
+processInput
+exit 0
---- /dev/null 2006-01-20 06:37:43.888693712 +0100
-+++ udev-078/extras/load_floppy_module.sh 2006-01-23 11:21:53.000000000 +0100
+--- /dev/null 2006-01-25 15:42:12.582274750 +0100
++++ udev-078/extras/load_floppy_module.sh 2006-01-26 08:39:21.000000000 +0100
@@ -0,0 +1,35 @@
+#!/bin/sh
+########################################################################
@@ -474,7 +479,7 @@
+
+exit $?
--- udev-078/extras/floppy/create_floppy_devices.c.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/extras/floppy/create_floppy_devices.c 2006-01-23 11:21:53.000000000 +0100
++++ udev-078/extras/floppy/create_floppy_devices.c 2006-01-26 08:39:21.000000000 +0100
@@ -116,8 +116,12 @@
minor = (table_sup[type][i] << 2) + fdnum;
if (print_nodes)
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- udev.spec 24 Jan 2006 12:37:12 -0000 1.141
+++ udev.spec 26 Jan 2006 08:12:17 -0000 1.142
@@ -5,7 +5,7 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 078
-Release: 7
+Release: 8
License: GPL
Group: System Environment/Base
Provides: udev-persistent = 0:%{version}-%{release}
@@ -282,6 +282,9 @@
%attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
%changelog
+* Thu Jan 26 2006 Harald Hoyer <harald at redhat.com> - 078-8
+- changed usb device naming
+
* Tue Jan 24 2006 Harald Hoyer <harald at redhat.com> - 078-7
- put WAIT_FOR_SYSFS rules in 05-udev-early.rules
- Previous message (by thread): rpms/evolution-data-server/devel .cvsignore, 1.36, 1.37 evolution-data-server.spec, 1.79, 1.80 sources, 1.36, 1.37
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.120.ooo52428.execshield.bridges.patch, 1.1, 1.2 openoffice.org.spec, 1.609, 1.610
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list