rpms/udev/devel udev-091-lib64.patch, 1.2, 1.3 udev-rules.patch, 1.35, 1.36 udev.spec, 1.204, 1.205 udev-106-selinuxmedia.patch, 1.1, NONE udev-106-setenv.patch, 1.1, NONE

Harald Hoyer (harald) fedora-extras-commits at redhat.com
Wed Jun 27 08:33:06 UTC 2007


Author: harald

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

Modified Files:
	udev-091-lib64.patch udev-rules.patch udev.spec 
Removed Files:
	udev-106-selinuxmedia.patch udev-106-setenv.patch 
Log Message:
- added rule for SD cards in a TI FlashMedia slot (#217070)


udev-091-lib64.patch:

Index: udev-091-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-091-lib64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-091-lib64.patch	26 Jun 2007 14:39:44 -0000	1.2
+++ udev-091-lib64.patch	27 Jun 2007 08:32:59 -0000	1.3
@@ -1,5 +1,5 @@
 --- udev-113/Makefile.lib64	2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/Makefile	2007-06-26 16:29:17.000000000 +0200
++++ udev-113/Makefile	2007-06-26 16:37:34.000000000 +0200
 @@ -98,6 +98,8 @@
  libudevdir =	${prefix}/lib/udev
  mandir =	${prefix}/usr/share/man
@@ -18,8 +18,8 @@
  			-C $$target $@ || exit 1; \
  	done;
  .PHONY: all
---- udev-113/extras/volume_id/lib/Makefile.lib64	2007-06-26 16:29:17.000000000 +0200
-+++ udev-113/extras/volume_id/lib/Makefile	2007-06-26 16:35:40.000000000 +0200
+--- udev-113/extras/volume_id/lib/Makefile.lib64	2007-06-26 16:37:34.000000000 +0200
++++ udev-113/extras/volume_id/lib/Makefile	2007-06-26 16:37:34.000000000 +0200
 @@ -4,9 +4,9 @@
  #
  # Released under the GNU General Public License, version 2.
@@ -42,7 +42,7 @@
  	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
  	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 --- udev-113/extras/volume_id/Makefile.lib64	2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/extras/volume_id/Makefile	2007-06-26 16:29:17.000000000 +0200
++++ udev-113/extras/volume_id/Makefile	2007-06-26 16:37:34.000000000 +0200
 @@ -17,6 +17,9 @@
  libudevdir =	${prefix}/lib/udev
  mandir =	${prefix}/usr/share/man

udev-rules.patch:

Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- udev-rules.patch	26 Jun 2007 14:39:44 -0000	1.35
+++ udev-rules.patch	27 Jun 2007 08:32:59 -0000	1.36
@@ -0,0 +1,12 @@
+--- udev-113/etc/udev/redhat/05-udev-early.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
++++ udev-113/etc/udev/redhat/05-udev-early.rules	2007-06-26 16:52:47.000000000 +0200
+@@ -12,7 +12,8 @@
+ 
+ ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+ 
+-ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
++
++KERNEL=="[0-9]*:[0-9]*", ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+ 
+ LABEL="skip_wait"
+ 


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- udev.spec	26 Jun 2007 14:39:44 -0000	1.204
+++ udev.spec	27 Jun 2007 08:32:59 -0000	1.205
@@ -24,9 +24,7 @@
 Patch5: udev-extras.patch
 Patch7: udev-089-nopie.patch
 Patch9: udev-091-lib64.patch
-#Patch10: udev-106-selinuxmedia.patch
 Patch14: udev-095-dbgwait.patch
-#Patch15: udev-106-setenv.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -79,9 +77,7 @@
 %patch5 -p1 -b .rhextras
 %patch7 -p1 -b .nopie
 %patch9 -p1 -b .lib64
-#%patch10 -p1 -b .selinuxmedia
 %patch14 -p1 -b .dbgwait
-#%patch15 -p1 -b .setenv
 
 rm -f etc/udev/redhat/51-hotplug.rules
 %build
@@ -163,8 +159,9 @@
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 
+# Deprecated, but keep the ownership
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,makedev.d,scripts,devices}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d
 
 # force relative symlinks
 ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id
@@ -286,11 +283,7 @@
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
 %attr(0755,root,root) %dir %{udev_scriptdir}/
 %attr(0755,root,root) %dir %{udev_scriptdir}/devices/
-%ghost %dir %{_sysconfdir}/udev/scripts/
-%ghost %dir %{_sysconfdir}/udev/devices/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/default
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/
 %attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh
 %attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
 %attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
@@ -317,6 +310,11 @@
 %attr(0644,root,root) %{_mandir}/man8/path_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8*
 
+# Deprecated, but keep the ownership
+%ghost %dir %{_sysconfdir}/udev/scripts/
+%ghost %dir %{_sysconfdir}/udev/devices/
+%ghost %dir %{_sysconfdir}/dev.d/
+
 %if %{with_static}
 %files static
 %doc COPYING
@@ -346,6 +344,7 @@
 %changelog
 * Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 113-1
 - version 113
+- added rule for SD cards in a TI FlashMedia slot (#217070)
 
 * Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 106-4.1
 - fixed modprobedebug option


--- udev-106-selinuxmedia.patch DELETED ---


--- udev-106-setenv.patch DELETED ---




More information about the scm-commits mailing list