rpms/udev/devel start_udev, 1.76, 1.77 udev.nodes, 1.3, 1.4 udev.spec, 1.248, 1.249 udev-089-nopie.patch, 1.8, NONE udev-091-lib64.patch, 1.4, NONE udev-116-nettype.patch, 1.1, NONE udev-118-sysconf.patch, 1.2, NONE udev-120-rhrules.patch, 1.1, NONE
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Fri Aug 8 13:11:11 UTC 2008
Author: harald
Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3530
Modified Files:
start_udev udev.nodes udev.spec
Removed Files:
udev-089-nopie.patch udev-091-lib64.patch
udev-116-nettype.patch udev-118-sysconf.patch
udev-120-rhrules.patch
Log Message:
* Fri Aug 08 2008 Harald Hoyer <harald at redhat.com> 126-1
- version 126
- fixed udevadm syntax in start_udev (credits B.J.W. Polman)
- removed some manually created devices from makedev (bug #457125)
Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- start_udev 12 Jun 2008 09:37:40 -0000 1.76
+++ start_udev 8 Aug 2008 13:10:40 -0000 1.77
@@ -234,36 +234,36 @@
# trigger the sorted events
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
- /sbin/udevd -d
+ if strstr "$cmdline" udevtrace; then
+ UDEV_OPTS="$UDEV_OPTS --debug-trace"
+ fi
+ /sbin/udevd -d $UDEV_OPTS
ret=$[$ret + $?]
udevtimeout=$(getval udevtimeout $cmdline)
if strstr "$cmdline" udevdebug; then
- /sbin/udevadm control log_priority=debug
+ /sbin/udevadm control --log_priority=debug
fi
if strstr "$cmdline" udevinfo; then
- /sbin/udevadm control log_priority=info
- fi
- if strstr "$cmdline" udevtrace; then
- UDEV_OPTS="$UDEV_OPTS --debug-trace"
+ /sbin/udevadm control --log_priority=info
fi
if strstr "$cmdline" udevchilds; then
- /sbin/udevadm control max_childs_running=$(getval udevchilds $cmdline)
+ /sbin/udevadm control --max_childs_running=$(getval udevchilds $cmdline)
fi
if [ "$UDEV_PERSISTENT_STORAGE" == "no" ]; then
- /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1
+ /sbin/udevadm control --env=UDEV_NO_PERSISTENT_STORAGE=1
fi
if strstr "$cmdline" udevnopersist; then
- /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1
+ /sbin/udevadm control --env=UDEV_NO_PERSISTENT_STORAGE=1
fi
- /sbin/udevadm control env STARTUP=1
+ /sbin/udevadm control --env=STARTUP=1
if strstr "$cmdline" modprobedebug; then
- /sbin/udevadm control env MODPROBE_OPTIONS="-s -v -q"
+ /sbin/udevadm control --env=MODPROBE_OPTIONS="-s -v -q"
echo
findalias /sys | while read modules ; do
if [ -n "$modules" ]; then
@@ -279,7 +279,7 @@
wait_for_queue $udevtimeout
ret=$[$ret + $?]
wait
- /sbin/udevadm control env STARTUP=
+ /sbin/udevadm control --env=STARTUP=
else
echo -n " kernel too old for this udev version "
/sbin/udevd -d $UDEV_OPTS
Index: udev.nodes
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.nodes,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev.nodes 9 Jul 2007 15:45:39 -0000 1.3
+++ udev.nodes 8 Aug 2008 13:10:40 -0000 1.4
@@ -1,10 +1,4 @@
# These device have to be created manually
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
loop0
loop1
loop2
@@ -13,15 +7,8 @@
loop5
loop6
loop7
-parport0
-parport1
-parport2
-parport3
net/tun
ppp
-console
-null
-zero
lp0
lp1
lp2
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- udev.spec 20 Jun 2008 09:48:41 -0000 1.248
+++ udev.spec 8 Aug 2008 13:10:40 -0000 1.249
@@ -5,8 +5,8 @@
Summary: A userspace implementation of devfs
Name: udev
-Version: 124
-Release: 1%{?dist}.1
+Version: 126
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -19,12 +19,7 @@
Source4: fw_unit_symlinks.sh
Source5: udev.sysconfig
-Patch101: udev-116-nettype.patch
Patch102: udev-118-sysconf.patch
-Patch103: udev-089-nopie.patch
-Patch104: udev-091-lib64.patch
-
-Patch200: udev-120-rhrules.patch
ExclusiveOS: Linux
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -75,108 +70,36 @@
%prep
%setup -q
-
-%patch101 -p1 -b .nettype
%patch102 -p1 -b .sysconf
-%patch103 -p1 -b .nopie
-%patch104 -p1 -b .lib64
-
-%patch200 -p1 -b .rhrules
%build
-
+%configure --with-selinux --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib} --sbindir="/sbin" --enable-static
%if %{with_static}
-# Do not USE_LOG in udev.static,
-# because it causes segfaults on openlog (bug 136005)
-make OPTFLAGS="$RPM_OPT_FLAGS" \
- libdir="/%{_lib}" \
- usrlibdir="%{_libdir}" \
- USE_KLIBC=false \
- USE_SELINUX=true \
- USE_STATIC=true \
- V=true \
- STRIP="/bin/true" \
- udevdir="/dev" \
- USE_LOG=false DEBUG=%{debug} \
- VOLUME_ID_STATIC=true \
- EXTRAS=" \
- extras/scsi_id \
- extras/volume_id \
- extras/ata_id \
- extras/usb_id \
- extras/edd_id \
- extras/cdrom_id \
- extras/floppy \
- " all
-
-for i in udevd \
- udevadm \
- extras/scsi_id/scsi_id \
- extras/ata_id/ata_id \
- extras/edd_id/edd_id \
- extras/usb_id/usb_id \
- extras/cdrom_id/cdrom_id \
- extras/volume_id/vol_id \
- extras/floppy/create_floppy_devices \
- ; do
- mv $i $i.static
- touch $i
+make LDFLAGS=-static %{?_smp_mflags}
+for i in udev/udevd \
+ udev/udevadm \
+ extras/scsi_id/scsi_id \
+ extras/ata_id/ata_id \
+ extras/edd_id/edd_id \
+ extras/usb_id/usb_id \
+ extras/cdrom_id/cdrom_id \
+ extras/volume_id/vol_id \
+ extras/floppy/create_floppy_devices \
+ ; do
+ mv $i $i.static
done
-
make clean
-make E='@echo' Q='@' -C extras/volume_id/lib clean
%endif
+make %{?_smp_mflags}
-%ifarch sparc64
-make OPTFLAGS="$RPM_OPT_FLAGS -fPIE -pie" LDFLAGS="-pie" \
-%else
-make OPTFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
-%endif
- USE_KLIBC=false \
- USE_SELINUX=true \
- udevdir="/dev" \
- USE_LOG=true \
- DEBUG=%{debug} \
- STRIP="/bin/true" \
- V=true \
- EXTRAS=" \
- extras/scsi_id \
- extras/ata_id \
- extras/usb_id \
- extras/edd_id \
- extras/path_id \
- extras/volume_id \
- extras/cdrom_id \
- extras/floppy \
- extras/rule_generator \
- extras/firmware \
- " all
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-%ifarch sparc64
-make DESTDIR=$RPM_BUILD_ROOT OPTFLAGS="$RPM_OPT_FLAGS -fPIE -pie" LDFLAGS="-pie"\
-%else
-make DESTDIR=$RPM_BUILD_ROOT OPTFLAGS="$RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie"\
-%endif
- libdir="/%{_lib}" \
- usrlibdir="%{_libdir}" \
- EXTRAS=" \
- extras/scsi_id \
- extras/ata_id \
- extras/usb_id \
- extras/edd_id \
- extras/path_id \
- extras/volume_id \
- extras/cdrom_id \
- extras/floppy \
- extras/rule_generator \
- extras/firmware \
- " install
+make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
@@ -185,6 +108,7 @@
# 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
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
# force relative symlinks
ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id
@@ -195,10 +119,9 @@
ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevtest
ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevmonitor
-%if 0%{?fedora} <= 9
ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevtrigger
+ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevsettle
ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevcontrol
-%endif
%if %{with_static}
for i in extras/scsi_id/scsi_id \
@@ -211,31 +134,29 @@
install -m 0755 $i.static $RPM_BUILD_ROOT%{udev_scriptdir}/$(basename $i).static
done
-for i in udevd udevadm; do
- install -m 0755 $i.static $RPM_BUILD_ROOT/sbin/$i.static
+for i in udev/udevd udev/udevadm; do
+ install -m 0755 $i.static $RPM_BUILD_ROOT/sbin/$(basename $i).static
done
%endif
for i in \
- etc/udev/redhat/*.rules \
+ rules/redhat/*.rules \
%ifarch ia64
- etc/udev/packages/40-ia64.rules \
+ rules/packages/40-ia64.rules \
%endif
%ifarch ppc ppc64
- etc/udev/packages/40-ppc.rules \
+ rules/packages/40-ppc.rules \
%endif
%ifarch s390 s390x
- etc/udev/packages/40-s390.rules \
+ rules/packages/40-s390.rules \
%endif
- etc/udev/packages/40-alsa.rules \
- etc/udev/packages/64-md-raid.rules \
- etc/udev/packages/64-device-mapper.rules \
+ rules/packages/40-alsa.rules \
+ rules/packages/64-md-raid.rules \
+ rules/packages/64-device-mapper.rules \
; do
- install -m 0644 "$i" "$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/${i##*/}"
+ install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}"
done
-install -m 0644 etc/udev/udev.conf $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
-
mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
@@ -243,7 +164,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
-#install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin
mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
@@ -316,13 +236,11 @@
%files
%defattr(-,root,root)
-%doc COPYING README TODO ChangeLog RELEASE-NOTES docs/*
+%doc COPYING README TODO ChangeLog docs/*
%attr(0755,root,root) /sbin/udevadm
%attr(0755,root,root) /sbin/udevsettle
-%if 0%{?fedora} <= 9
%attr(0755,root,root) /sbin/udevtrigger
%attr(0755,root,root) /sbin/udevcontrol
-%endif
%attr(0755,root,root) /sbin/udevd
%attr(0755,root,root) /sbin/start_udev
%attr(0755,root,root) /sbin/scsi_id
@@ -339,6 +257,10 @@
%attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
%attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
%attr(0755,root,root) %{udev_scriptdir}/write_net_rules
+%attr(0755,root,root) %{udev_scriptdir}/collect
+%attr(0755,root,root) %{udev_scriptdir}/fstab_import
+
+%attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/
%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
%attr(0755,root,root) %{_bindir}/udevtest
%attr(0755,root,root) %{_bindir}/udevinfo
@@ -352,7 +274,7 @@
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
-%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/*.rules
+%config %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
#%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
@@ -400,11 +322,16 @@
%doc COPYING
%defattr(0644, root, root, 0755)
%{_includedir}/libvolume_id.h
-%{_libdir}/libvolume_id.a
%{_libdir}/libvolume_id.so
+%{_libdir}/libvolume_id.a
%{_libdir}/pkgconfig/libvolume_id.pc
%changelog
+* Fri Aug 08 2008 Harald Hoyer <harald at redhat.com> 126-1
+- version 126
+- fixed udevadm syntax in start_udev (credits B.J.W. Polman)
+- removed some manually created devices from makedev (bug #457125)
+
* Tue Jun 17 2008 Harald Hoyer <harald at redhat.com> 124-1.1
- readded udevcontrol, udevtrigger symlinks for Fedora 9,
which are needed by live-cd-tools
--- udev-089-nopie.patch DELETED ---
--- udev-091-lib64.patch DELETED ---
--- udev-116-nettype.patch DELETED ---
--- udev-118-sysconf.patch DELETED ---
--- udev-120-rhrules.patch DELETED ---
More information about the fedora-extras-commits
mailing list