[udev] version 170 removed /sbin/start_udev
Harald Hoyer
harald at fedoraproject.org
Fri May 20 12:39:51 UTC 2011
commit e70c43125b3db3ddd6c0678655428f33d40e6191
Author: Harald Hoyer <harald at redhat.com>
Date: Fri May 20 14:40:12 2011 +0200
version 170
removed /sbin/start_udev
0002-Run-ata_id-on-non-removable-USB-devices.patch | 56 ------
...-settle-depend-on-trigger-do-not-block-ba.patch | 51 -----
...r-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch | 29 ---
0005-udevd-add-N-to-optstring-in-getopt_long.patch | 22 --
...t-Do-not-build-extras-with-disable-extras.patch | 34 ----
...d-spinning-up-CD-on-pressing-eject-button.patch | 45 -----
...ort-Dell-Latitude-XT2-tablet-mode-navigat.patch | 56 ------
...selinux-do-not-label-files-in-runtime-dir.patch | 204 -------------------
...irmware-do-not-label-files-in-runtime-dir.patch | 25 ---
start_udev | 82 --------
udev-167-selinux_label.patch | 208 --------------------
udev.spec | 91 +++------
12 files changed, 27 insertions(+), 876 deletions(-)
---
diff --git a/udev.spec b/udev.spec
index 6b402b4..afa762f 100644
--- a/udev.spec
+++ b/udev.spec
@@ -6,27 +6,14 @@
Summary: A rule-based device node and kernel event manager
Name: udev
-Version: 167
-Release: 4%{?dist}
+Version: 170
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
Obsoletes: udev-persistent < 0:030-5
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-Source1: start_udev
-
-Patch2: 0002-Run-ata_id-on-non-removable-USB-devices.patch
-Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch
-Patch4: 0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch
-Patch5: 0005-udevd-add-N-to-optstring-in-getopt_long.patch
-Patch6: 0006-Revert-Do-not-build-extras-with-disable-extras.patch
-Patch7: 0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch
-Patch8: 0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch
-Patch9: 0009-selinux-do-not-label-files-in-runtime-dir.patch
-Patch10: 0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch
-
-
ExclusiveOS: Linux
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,7 +23,7 @@ Requires(pre): /usr/bin/getent /usr/sbin/groupadd
Requires: hwdata
Requires: systemd-units
Requires: pkgconfig
-Conflicts: systemd < 3
+Conflicts: systemd < 25
%ifarch s390 s390x
# Require s390utils-base, because it's essential on s390
@@ -121,15 +108,6 @@ glib-based applications using libudev functionality.
%prep
%setup -q
-%patch2 -p1 -b .git2
-%patch3 -p1 -b .git3
-%patch4 -p1 -b .git4
-%patch5 -p1 -b .git5
-%patch6 -p1 -b .git6
-%patch7 -p1 -b .git7
-%patch8 -p1 -b .git8
-%patch9 -p1 -b .git9
-%patch10 -p1 -b .git10
%build
# prevent man pages from re-building (xmlto)
@@ -147,7 +125,10 @@ libtoolize -f -c
--sbindir="/sbin" --libexecdir=%{udev_scriptdir} \
--with-rootlibdir=/%{_lib} \
--enable-introspection \
- --with-systemdsystemunitdir=%{systemdsystemunitdir}
+ --with-systemdsystemunitdir=%{systemdsystemunitdir} \
+ --enable-floppy \
+ --enable-edd \
+ --enable-action_modeswitch
make %{?_smp_mflags}
@@ -183,7 +164,7 @@ for i in \
; do
install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}"
done
-
+
mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices,devices/net,devices/pts,devices/shm,devices/hugepages}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
@@ -197,22 +178,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then
if test -x /usr/bin/stat -a \
"$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
- if [ -x /sbin/pidof ]; then
- pid=$(/sbin/pidof -c udevd)
- while [ -n "$pid" ]; do
- for p in $pid; do
- kill $hard $p 2>/dev/null
- done
- sleep 0.2
- pid=$(/sbin/pidof -c udevd)
- hard="-9"
- done
- fi
+ /sbin/udevadm control --exit 2>&1 || :
fi
- /sbin/chkconfig --del udev
+ /sbin/chkconfig --del udev || :
fi
if [ "$1" -eq 0 ]; then
- /sbin/chkconfig --del udev-retry
+ /sbin/chkconfig --del udev-retry || :
fi
/sbin/chkconfig --del udev-post >/dev/null 2>&1 || :
exit 0
@@ -223,39 +194,28 @@ getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
-# kill daemon if we are not in a chroot
-if test -f /proc/1/exe -a -d /proc/1/root; then
- if test -x /usr/bin/stat -a \
- "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
- /bin/systemctl stop udev.service >/dev/null 2>&1 || :
- if test -x /sbin/udevd -a -x /sbin/pidof ; then
- /sbin/udevadm control --stop-exec-queue
- pid=$(/sbin/pidof -c udevd)
- while [ -n "$pid" ]; do
- for p in $pid; do
- kill $hard $p 2>/dev/null
- done
- sleep 0.2
- pid=$(/sbin/pidof -c udevd)
- hard="-9"
- done
- fi
- fi
+if ! /bin/systemctl stop udev.service udev.socket >/dev/null 2>&1; then
+ # kill daemon if we are not in a chroot
+ if test -f /proc/1/exe -a -d /proc/1/root; then
+ if test -x /usr/bin/stat -a \
+ "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
+ /sbin/udevadm control --exit 2>&1 || :
+ fi
+ fi
fi
exit 0
%post
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-# start daemon if we are not in a chroot
-if test -f /proc/1/exe -a -d /proc/1/root; then
+if ! /bin/systemctl start udev.service >/dev/null 2>&1; then
+ # start daemon if we are not in a chroot
+ if test -f /proc/1/exe -a -d /proc/1/root; then
if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
- /bin/systemctl start udev.service >/dev/null 2>&1 || :
/sbin/udevd -d >/dev/null 2>&1 || :
- /sbin/udevadm control --start-exec-queue || :
fi
+ fi
fi
-
exit 0
%postun
@@ -282,7 +242,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{udev_scriptdir}/usb_id
%attr(0755,root,root) %{udev_scriptdir}/cdrom_id
%attr(0755,root,root) %{udev_scriptdir}/path_id
-%attr(0755,root,root) %{udev_scriptdir}/hid2hci
%attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
%attr(0755,root,root) %{udev_scriptdir}/firmware
%attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
@@ -377,6 +336,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Fri May 20 2011 Harald Hoyer <harald at redhat.com> 170-1
+- version 170
+- removed /sbin/start_udev
+
* Mon Apr 11 2011 Harald Hoyer <harald at redhat.com> 167-4
- more selinux fixes
More information about the scm-commits
mailing list