rpms/udev/devel firmware_helper.c, 1.1, 1.2 udev-rules.patch, 1.19, 1.20 udev.spec, 1.184, 1.185
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 25 15:02:13 UTC 2006
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14490
Modified Files:
firmware_helper.c udev-rules.patch udev.spec
Log Message:
- improved error msg for firmware_helper (bug #206944)
- added xpram symlink to slram device nodes (bug #135733)
- removed infiniband rules (bug #206224)
- use newest path_id script (bug #207139)
Index: firmware_helper.c
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/firmware_helper.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firmware_helper.c 19 Jul 2005 23:59:03 -0000 1.1
+++ firmware_helper.c 25 Sep 2006 15:02:11 -0000 1.2
@@ -115,6 +115,7 @@
fw_fd = open(data_path, O_RDWR);
if (fw_fd == -1) {
rc = errno;
+ fw_path = data_path;
goto out_err;
}
@@ -133,7 +134,8 @@
set_loading(devpath, 0);
return 0;
out_err:
- close(fw_fd);
+ if (fw_fd >= 0)
+ close(fw_fd);
set_loading(devpath, -1);
log_err(fw_path, rc);
return rc;
udev-rules.patch:
05-udev-early.rules | 1 +
50-udev.rules | 14 ++++----------
2 files changed, 5 insertions(+), 10 deletions(-)
Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- udev-rules.patch 29 Aug 2006 08:09:03 -0000 1.19
+++ udev-rules.patch 25 Sep 2006 15:02:11 -0000 1.20
@@ -1,5 +1,5 @@
--- udev-095/etc/udev/redhat/50-udev.rules.rhrules 2006-07-04 12:34:55.000000000 +0200
-+++ udev-095/etc/udev/redhat/50-udev.rules 2006-08-29 10:06:55.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules 2006-09-25 15:53:53.000000000 +0200
@@ -28,7 +28,8 @@
KERNEL=="ippp*", NAME="%k", MODE="0660"
KERNEL=="isdn*", NAME="%k", MODE="0660"
@@ -10,7 +10,14 @@
KERNEL=="dcbri*", NAME="%k", MODE="0660"
KERNEL=="ircomm*", NAME="%k", GROUP="uucp", MODE="0660"
KERNEL=="tts/[0-9]*", NAME="%k", GROUP="uucp", MODE="0660"
-@@ -155,10 +156,7 @@
+@@ -149,16 +150,14 @@
+
+ # s390 devices
+ KERNEL=="z90crypt", MODE="0666"
++KERNEL="slram[0-9]*", SYMLINK="xpram%n"
+
+ # DVB
+ KERNEL=="dvb", MODE="0660"
SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
NAME="%c", MODE="0660"
@@ -22,21 +29,17 @@
# alsa devices
KERNEL=="controlC[0-9]*", NAME="snd/%k"
-@@ -217,8 +215,11 @@
+@@ -217,9 +216,6 @@
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"
-+KERNEL=="umad*", NAME="infiniband/%k", MODE="0660"
-+KERNEL=="issm*", NAME="infiniband/%k", MODE="0660"
-+KERNEL=="uverbs*", NAME="infiniband/%k", MODE="0660"
-+KERNEL=="ucm*", NAME="infiniband/%k", MODE="0660"
-+KERNEL=="rdma_cm", NAME="infiniband/%k", MODE="0660"
-
+-
# Section for zaptel device
KERNEL=="zapctl", NAME="zap/ctl"
-@@ -229,8 +230,6 @@
+ KERNEL=="zaptimer", NAME="zap/timer"
+@@ -229,8 +225,6 @@
KERNEL=="pktcdvd", NAME="%k/control"
@@ -46,7 +49,7 @@
SYSFS{device/media}=="floppy", \
SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
--- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules 2006-07-04 12:34:55.000000000 +0200
-+++ udev-095/etc/udev/redhat/05-udev-early.rules 2006-08-29 10:06:05.000000000 +0200
++++ udev-095/etc/udev/redhat/05-udev-early.rules 2006-09-25 13:16:26.000000000 +0200
@@ -1,6 +1,7 @@
# sysfs is populated after the event is sent
ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- udev.spec 29 Aug 2006 08:09:03 -0000 1.184
+++ udev.spec 25 Sep 2006 15:02:11 -0000 1.185
@@ -3,7 +3,7 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 095
-Release: 8
+Release: 9
License: GPL
Group: System Environment/Base
Provides: udev-persistent = 0:%{version}-%{release}
@@ -25,6 +25,7 @@
Patch9: udev-091-lib64.patch
Patch10: udev-095-longcomment.patch
Patch11: udev-095-selinux.patch
+Patch12: udev-095-path_id.patch
ExclusiveOS: Linux
URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -71,6 +72,7 @@
%patch9 -p1 -b .lib64
%patch10 -p1 -b .longcomment
%patch11 -p1 -b .selinux
+%patch12 -p1 -b .pathid
%build
@@ -98,7 +100,6 @@
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
@@ -137,7 +138,6 @@
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
@@ -193,7 +193,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
-#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 udevtrigger $RPM_BUILD_ROOT/sbin
install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
@@ -329,6 +328,12 @@
%{_libdir}/pkgconfig/libvolume_id.pc
%changelog
+* Mon Sep 25 2006 Harald Hoyer <harald at redhat.com> - 095-9
+- improved error msg for firmware_helper (bug #206944)
+- added xpram symlink to slram device nodes (bug #135733)
+- removed infiniband rules (bug #206224)
+- use newest path_id script (bug #207139)
+
* Tue Aug 29 2006 Harald Hoyer <harald at redhat.com> - 095-8
- fixed bug #204157
More information about the fedora-cvs-commits
mailing list