rpms/udev/devel .cvsignore, 1.42, 1.43 sources, 1.42, 1.43 start_udev, 1.60, 1.61 udev-089-nopie.patch, 1.6, 1.7 udev-091-lib64.patch, 1.1, 1.2 udev-rules.patch, 1.34, 1.35 udev.spec, 1.203, 1.204
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Tue Jun 26 14:40:22 UTC 2007
Author: harald
Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17021
Modified Files:
.cvsignore sources start_udev udev-089-nopie.patch
udev-091-lib64.patch udev-rules.patch udev.spec
Log Message:
version 113
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 7 Mar 2007 18:01:25 -0000 1.42
+++ .cvsignore 26 Jun 2007 14:39:44 -0000 1.43
@@ -1 +1 @@
-udev-106.tar.bz2
+udev-113.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 7 Mar 2007 18:01:25 -0000 1.42
+++ sources 26 Jun 2007 14:39:44 -0000 1.43
@@ -1 +1 @@
-320ccd2d0f4540d10e021bafa14f8985 udev-106.tar.bz2
+cb9a227206b9d85ae8cfc88fc51c1710 udev-113.tar.bz2
Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- start_udev 27 Apr 2007 12:48:07 -0000 1.60
+++ start_udev 26 Jun 2007 14:39:44 -0000 1.61
@@ -183,12 +183,13 @@
if [ -f "/sys/class/tty/console/uevent" ]; then
# trigger the sorted events
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+ /sbin/udevd -d
+ ret=$[$ret + $?]
+
if strstr "$cmdline" modprobedebug; then
/sbin/udevcontrol env MODPROBE_DEBUG=1
MODPROBE_OPTIONS="-s -v"
fi
- /sbin/udevd -d
- ret=$[$ret + $?]
if strstr "$cmdline" udevdebug; then
/sbin/udevcontrol log_priority=debug
fi
udev-089-nopie.patch:
Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- udev-089-nopie.patch 3 May 2006 15:54:21 -0000 1.6
+++ udev-089-nopie.patch 26 Jun 2007 14:39:44 -0000 1.7
@@ -1,17 +1,18 @@
---- udev-091/extras/volume_id/lib/Makefile.nopie 2006-04-25 22:39:59.000000000 +0200
-+++ udev-091/extras/volume_id/lib/Makefile 2006-05-03 16:23:33.000000000 +0200
-@@ -67,7 +67,7 @@
-
+--- udev-113/extras/volume_id/lib/Makefile.nopie 2007-06-23 17:44:48.000000000 +0200
++++ udev-113/extras/volume_id/lib/Makefile 2007-06-26 16:19:25.000000000 +0200
+@@ -72,7 +72,8 @@
.shlib/%.o: %.c
$(E) " CC " $@
+ $(Q) mkdir -p $(dir $@)
- $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
+ $(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -c $(CFLAGS) -fPIC $< -o $@
++# $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
libvolume_id.a: $(HEADERS) $(OBJS)
$(Q) rm -f $@
-@@ -78,7 +78,7 @@
+@@ -83,7 +84,7 @@
- $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
+ $(SHLIB): $(HEADERS) exported_symbols $(addprefix .shlib/,$(OBJS))
$(E) " CC " $@
- $(Q) $(CC) -shared $(CFLAGS) -o $@ \
+ $(Q) $(subst -fpie,,$(subst -pie,,$(CC) )) -shared $(CFLAGS) -o $@ \
udev-091-lib64.patch:
Index: udev-091-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-091-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-091-lib64.patch 3 May 2006 16:19:56 -0000 1.1
+++ udev-091-lib64.patch 26 Jun 2007 14:39:44 -0000 1.2
@@ -1,6 +1,6 @@
---- udev-091/Makefile.lib64 2006-04-25 22:39:59.000000000 +0200
-+++ udev-091/Makefile 2006-05-03 18:16:31.000000000 +0200
-@@ -103,6 +103,8 @@
+--- udev-113/Makefile.lib64 2007-06-23 17:44:48.000000000 +0200
++++ udev-113/Makefile 2007-06-26 16:29:17.000000000 +0200
+@@ -98,6 +98,8 @@
libudevdir = ${prefix}/lib/udev
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev
@@ -9,7 +9,7 @@
udevdir = /dev
DESTDIR =
-@@ -179,6 +181,8 @@
+@@ -168,6 +170,8 @@
RANLIB="$(RANLIB)" \
LIB_OBJS="$(LIB_OBJS)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
@@ -18,8 +18,8 @@
-C $$target $@ || exit 1; \
done;
.PHONY: all
---- udev-091/extras/volume_id/lib/Makefile.lib64 2006-05-03 18:15:28.000000000 +0200
-+++ udev-091/extras/volume_id/lib/Makefile 2006-05-03 18:15:53.000000000 +0200
+--- 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
@@ -4,9 +4,9 @@
#
# Released under the GNU General Public License, version 2.
@@ -31,10 +31,18 @@
+libdir ?= ${prefix}/lib
+usrlibdir ?= ${prefix}/usr/lib
- INSTALL = /usr/bin/install -c
+ INSTALL = install -c
INSTALL_DATA = ${INSTALL} -m 644
---- udev-091/extras/volume_id/Makefile.lib64 2006-04-25 22:39:59.000000000 +0200
-+++ udev-091/extras/volume_id/Makefile 2006-05-03 18:16:14.000000000 +0200
+@@ -106,6 +106,7 @@
+ $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+ $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+ mkdir -p $(DESTDIR)$(usrlibdir)/
++ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+ ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+ 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
@@ -17,6 +17,9 @@
libudevdir = ${prefix}/lib/udev
mandir = ${prefix}/usr/share/man
@@ -43,17 +51,18 @@
+usrlibdir ?= ${prefix}/usr/lib
+
- INSTALL = /usr/bin/install -c
+ INSTALL = install -c
INSTALL_PROGRAM = ${INSTALL}
-@@ -32,7 +35,10 @@
+@@ -34,7 +37,11 @@
$(Q) $(CC) -c $(CFLAGS) $< -o $@
- lib/libvolume_id.a:
-- $(Q) $(MAKE) -C lib
+ lib:
+- $(Q) $(MAKE) -C $@
+ $(Q) $(MAKE) \
+ libdir=$(libdir) \
+ usrlibdir=$(usrlibdir) \
+ -C lib
++# $(Q) $(MAKE) -C $@
+ .PHONY: lib
- $(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
- $(E) " LD " $@
+ lib/libvolume_id.a: lib
udev-rules.patch:
Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- udev-rules.patch 2 May 2007 10:18:23 -0000 1.34
+++ udev-rules.patch 26 Jun 2007 14:39:44 -0000 1.35
@@ -1,102 +0,0 @@
---- udev-106/etc/udev/redhat/50-udev.rules.rhrules 2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/50-udev.rules 2007-05-02 12:15:07.000000000 +0200
-@@ -41,9 +41,6 @@
- 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*", ATTRS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
--KERNEL=="ttyUSB*", ATTRS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
--KERNEL=="ttyUSB*", ATTRS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
-
- # vc devices
- KERNEL=="vcs", NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-@@ -68,9 +65,6 @@
- KERNEL=="nvram", MODE="0660"
- KERNEL=="rtc", MODE="0644"
-
--# pnp devices
--ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
--
- # floppy devices
- KERNEL=="fd[01]*", GROUP="floppy", MODE="0660"
- # fix floppy devices
-@@ -212,7 +206,7 @@
- KERNEL=="vbi0", SYMLINK+="vbi"
- KERNEL=="null", SYMLINK+="XOR"
-
--KERNEL=="tun", NAME="net/%k"
-+KERNEL=="tun", NAME="net/%k", MODE="0666"
-
- KERNEL=="device-mapper", NAME="mapper/control"
-
-@@ -233,6 +227,7 @@
-
- KERNEL=="pktcdvd", NAME="%k/control"
-
-+
- KERNEL=="hd*[!0-9]", ATTR{removable}=="1", \
- ATTR{media}=="floppy", \
- SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
-@@ -255,6 +250,7 @@
- OPTIONS+="ignore_remove"
-
-
-+
- #######################################
- # Persistent block device stuff - begin
- #######################################
-@@ -280,7 +276,6 @@
- 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
-@@ -315,9 +310,6 @@
- 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+="modprobe $env{MODALIAS}"
--
--ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
-
- # sd: 0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
- # sr: 4 TYPE_WORM, 5 TYPE_ROM
-@@ -351,5 +343,6 @@
- # mmc block devices
- ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
-
-+
- RUN+="socket:/org/kernel/udev/monitor"
-
---- udev-106/etc/udev/redhat/95-pam-console.rules.rhrules 2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/95-pam-console.rules 2007-05-02 12:04:15.000000000 +0200
-@@ -1 +1 @@
--ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
-+ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
---- udev-106/etc/udev/redhat/05-udev-early.rules.rhrules 2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/05-udev-early.rules 2007-05-02 12:07:55.000000000 +0200
-@@ -1,10 +1,19 @@
- # 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"
--ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
--
- # ignore these events until someone needs them
- SUBSYSTEM=="drivers", OPTIONS="ignore_device"
- SUBSYSTEM=="module", OPTIONS="ignore_device"
-
-+
-+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", GOTO="skip_wait"
-+
-+# pnp devices
-+ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
-+
-+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-+
-+ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-+
-+LABEL="skip_wait"
-+
- ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- udev.spec 2 May 2007 10:18:23 -0000 1.203
+++ udev.spec 26 Jun 2007 14:39:44 -0000 1.204
@@ -5,8 +5,8 @@
Summary: A userspace implementation of devfs
Name: udev
-Version: 106
-Release: 4%{?dist}
+Version: 113
+Release: 1%{?dist}
License: GPL
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -24,9 +24,9 @@
Patch5: udev-extras.patch
Patch7: udev-089-nopie.patch
Patch9: udev-091-lib64.patch
-Patch10: udev-106-selinuxmedia.patch
+#Patch10: udev-106-selinuxmedia.patch
Patch14: udev-095-dbgwait.patch
-Patch15: udev-106-setenv.patch
+#Patch15: udev-106-setenv.patch
ExclusiveOS: Linux
URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -79,9 +79,9 @@
%patch5 -p1 -b .rhextras
%patch7 -p1 -b .nopie
%patch9 -p1 -b .lib64
-%patch10 -p1 -b .selinuxmedia
+#%patch10 -p1 -b .selinuxmedia
%patch14 -p1 -b .dbgwait
-%patch15 -p1 -b .setenv
+#%patch15 -p1 -b .setenv
rm -f etc/udev/redhat/51-hotplug.rules
%build
@@ -96,13 +96,13 @@
STRIP="/bin/true" \
udevdir="/dev" \
USE_LOG=false DEBUG=%{debug} \
+ VOLUME_ID_STATIC=true \
EXTRAS=" \
extras/scsi_id \
extras/ata_id \
extras/usb_id \
extras/edd_id \
extras/volume_id \
- extras/run_directory \
extras/floppy \
" all
@@ -113,8 +113,7 @@
extras/usb_id/usb_id \
extras/volume_id/vol_id \
extras/floppy/create_floppy_devices \
- extras/run_directory/udev_run_devd \
- extras/run_directory/udev_run_hotplugd; do
+ ; do
mv $i $i.static
touch $i
done
@@ -137,7 +136,6 @@
extras/edd_id \
extras/path_id \
extras/volume_id \
- extras/run_directory \
extras/floppy \
" all
@@ -158,7 +156,6 @@
extras/edd_id \
extras/path_id \
extras/volume_id \
- extras/run_directory \
extras/floppy \
" install
@@ -181,8 +178,7 @@
extras/usb_id/usb_id \
extras/volume_id/vol_id \
extras/floppy/create_floppy_devices \
- extras/run_directory/udev_run_devd \
- extras/run_directory/udev_run_hotplugd; do
+ ; do
install -m 0755 $i.static $RPM_BUILD_ROOT%{udev_scriptdir}/$(basename $i).static
done
@@ -210,7 +206,6 @@
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
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
mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
@@ -218,7 +213,7 @@
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
#!/bin/sh
-for i in loop nvram floppy parport lp snd-powermac sonypi;do
+for i in loop nvram floppy parport lp sonypi;do
modprobe \$i >/dev/null 2>&1
done
EOF
@@ -276,8 +271,6 @@
%attr(0755,root,root) /sbin/udevsettle
%attr(0755,root,root) /sbin/start_udev
%attr(0755,root,root) /sbin/scsi_id
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_devd
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_hotplugd
%attr(0755,root,root) %{udev_scriptdir}/scsi_id
%attr(0755,root,root) %{udev_scriptdir}/ata_id
%attr(0755,root,root) %{udev_scriptdir}/edd_id
@@ -298,7 +291,6 @@
%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}/MAKEDEV.dev
%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
@@ -322,6 +314,8 @@
%attr(0644,root,root) %{_mandir}/man8/ata_id*.8*
%attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
%attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
+%attr(0644,root,root) %{_mandir}/man8/path_id*.8*
+%attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8*
%if %{with_static}
%files static
@@ -329,8 +323,6 @@
%attr(0755,root,root) /sbin/udevd.static
%attr(0755,root,root) /sbin/udevtrigger.static
%attr(0755,root,root) /sbin/udevsettle.static
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_devd.static
-%attr(0755,root,root) %{udev_scriptdir}/udev_run_hotplugd.static
%attr(755,root,root) %{udev_scriptdir}/scsi_id.static
%attr(755,root,root) %{udev_scriptdir}/ata_id.static
%attr(755,root,root) %{udev_scriptdir}/edd_id.static
@@ -352,6 +344,13 @@
%{_libdir}/pkgconfig/libvolume_id.pc
%changelog
+* Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 113-1
+- version 113
+
+* Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 106-4.1
+- fixed modprobedebug option
+- removed snd-powermac from the default modules (#200585)
+
* Wed May 02 2007 Harald Hoyer <harald at redhat.com> - 106-4
- do not skip all events on modprobe (#238385)
- Resolves: rhbz#238385
More information about the fedora-extras-commits
mailing list