rpms/udev/devel udev-rules.patch,1.39,1.40 udev.spec,1.209,1.210

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28147

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- kernel does not provide usb_device anymore,
  corrected the rules (#248916)


udev-rules.patch:

Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- udev-rules.patch	19 Jul 2007 16:46:06 -0000	1.39
+++ udev-rules.patch	20 Jul 2007 12:58:24 -0000	1.40
@@ -1,5 +1,5 @@
 --- udev-113/etc/udev/redhat/50-udev.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/etc/udev/redhat/50-udev.rules	2007-07-19 18:43:32.000000000 +0200
++++ udev-113/etc/udev/redhat/50-udev.rules	2007-07-20 14:55:37.000000000 +0200
 @@ -4,7 +4,7 @@
  # default is OWNER="root" GROUP="root", MODE="0600"
  #
@@ -38,16 +38,24 @@
  KERNEL=="raw[0-9]*",		NAME="raw/%k"
  
  KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
-@@ -306,7 +308,7 @@
+@@ -306,10 +308,13 @@
  #####################################
  
  
 -ACTION=="add", SUBSYSTEM=="usb_device", \
-+ACTION=="add", SUBSYSTEM=="usb_endpoint", \
- 	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
- 	NAME="%c", MODE="0644"
+-	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
+-	NAME="%c", MODE="0644"
++ACTION=="add", SUBSYSTEM=="usb", ATTR{devnum}=="?*", ATTR{busnum}=="?*", \
++	NAME="bus/usb/$attr{busnum}/$attr{devnum}", MODE="0644"
  
-@@ -321,11 +323,11 @@
++ACTION=="add", SUBSYSTEM=="usb_endpoint", \
++	ATTR{bEndpointAddress}=="?*", ATTRS{devnum}=="?*", ATTRS{busnum}=="?*", \
++	NAME="bus/usb/$attr{busnum}/$attr{devnum}_ep/$attr{bEndpointAddress}", \
++	MODE="0644", SYMLINK+="%k"
+ 
+ # sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+ # sr:           4 TYPE_WORM, 5 TYPE_ROM
+@@ -321,11 +326,11 @@
  	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
  
  
@@ -62,7 +70,7 @@
  
  ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
  	SYMLINK+="scanner scanner-%k", MODE="0660"
-@@ -334,14 +336,14 @@
+@@ -334,14 +339,14 @@
  	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
  
  ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- udev.spec	19 Jul 2007 16:46:06 -0000	1.209
+++ udev.spec	20 Jul 2007 12:58:24 -0000	1.210
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 113
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -343,9 +343,12 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Jul 20 2007 Harald Hoyer <harald at redhat.com> - 113-6
+- kernel does not provide usb_device anymore,
+  corrected the rules (#248916)
+
 * Thu Jul 19 2007 Harald Hoyer <harald at redhat.com> - 113-5
-- kernel changed subsystem name from usb_device to usb_endpoint,
-  corrected the rule (#248916)
+- corrected the rule for usb devices (#248916)
 
 * Sat Jul 14 2007 Harald Hoyer <harald at redhat.com> - 113-4
 - do not collect modprobes (bug #222542), because firmware