[udev] - renamed udev-post initscript to udev-retry to match upstream systemd service name - version 166
Harald Hoyer
harald at fedoraproject.org
Wed Feb 16 17:24:49 UTC 2011
commit 57a491c1af046cbe4c2c8b7740cc855de4cc2224
Author: Harald Hoyer <harald at redhat.com>
Date: Wed Feb 16 18:26:09 2011 +0100
- renamed udev-post initscript to udev-retry to match
upstream systemd service name
- version 166
.gitignore | 2 +
...s-keymap-Make-touchpad-buttons-consistent.patch | 232 --------------------
...map-Add-force-release-for-HP-touchpad-off.patch | 56 -----
sources | 4 +-
udev-pda-acl.patch | 20 --
udev-random_temporary_ifname.patch | 22 --
udev-ressize.patch | 24 --
udev-post.init => udev-retry.init | 8 +-
udev.spec | 42 ++--
9 files changed, 31 insertions(+), 379 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65d08f4..ff4586d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
udev-160.tar.bz2
/udev-164.tar.bz2
/udev-164.tar.bz2.sign
+/udev-166.tar.bz2
+/udev-166.tar.bz2.sign
diff --git a/sources b/sources
index 8dc2880..871f305 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cd285a85f969518a671834de2f4d6614 udev-164.tar.bz2
-43b3842a00854e712b1d58af3a03e4ed udev-164.tar.bz2.sign
+4db27d73fdbe94f47fd89fdd105c2dfb udev-166.tar.bz2
+3cb37564a589d4fedd6e7e3e178698d4 udev-166.tar.bz2.sign
diff --git a/udev-post.init b/udev-retry.init
similarity index 89%
rename from udev-post.init
rename to udev-retry.init
index f882e0d..b4cb201 100644
--- a/udev-post.init
+++ b/udev-retry.init
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# udev-post Post script for udev, after all filesystems are mounted
+# udev-retry Post script for udev, after all filesystems are mounted
#
# Authors: Harald Hoyer <harald at redhat.com>
#
@@ -14,7 +14,7 @@
# Required-Stop:
# Short-Description: Moves the generated persistent udev rules to /etc/udev/rules.d
# Description: Moves the generated persistent udev rules to /etc/udev/rules.d
-# Provides: udev-post
+# Provides: udev-retry
### END INIT INFO
. /etc/rc.d/init.d/functions
@@ -49,12 +49,12 @@ case "$1" in
fi
done
- touch /var/lock/subsys/udev-post
+ touch /var/lock/subsys/udev-retry
exit 0
;;
stop)
[ -w /var/lock/subsys ] || exit 4
- rm -f /var/lock/subsys/udev-post
+ rm -f /var/lock/subsys/udev-retry
exit 0
;;
status)
diff --git a/udev.spec b/udev.spec
index 49dfbb6..be272ad 100644
--- a/udev.spec
+++ b/udev.spec
@@ -6,8 +6,8 @@
Summary: A rule-based device node and kernel event manager
Name: udev
-Version: 164
-Release: 9%{?dist}
+Version: 166
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -15,13 +15,8 @@ Obsoletes: udev-persistent < 0:030-5
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
Source1: start_udev
-Source2: udev-post.init
+Source2: udev-retry.init
-Patch1: udev-ressize.patch
-Patch2: udev-pda-acl.patch
-Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch
-Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch
-Patch5: udev-random_temporary_ifname.patch
Patch6: udev-164-no-v4l1.patch
ExclusiveOS: Linux
@@ -120,14 +115,15 @@ glib-based applications using libudev functionality.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%patch6 -p1
%build
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
+
+# prevent man pages from re-building (xmlto)
+find . -name "*.[1-8]" -exec touch '{}' \;
+export V=1
+
libtoolize -f -c
%configure --with-selinux --prefix=%{_prefix} --exec-prefix="" \
--sysconfdir=%{_sysconfdir} \
@@ -179,7 +175,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
+install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-retry
%preun
if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then
@@ -200,8 +196,9 @@ if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then
/sbin/chkconfig --del udev
fi
if [ "$1" -eq 0 ]; then
- /sbin/chkconfig --del udev-post
+ /sbin/chkconfig --del udev-retry
fi
+/sbin/chkconfig --del udev-post >/dev/null 2>&1 || :
exit 0
%pre
@@ -231,15 +228,17 @@ fi
exit 0
%post
+# convert old database files
+/sbin/udevadm info --convert-db >/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 test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then
/sbin/udevd -d
- /sbin/udevadm control --start-exec-queue
+ /sbin/udevadm control --start-exec-queue || :
fi
fi
-/sbin/chkconfig --add udev-post
-#/usr/bin/systemd-install --system --realize=minimal enable udev.service >/dev/null 2>&1 || :
+/sbin/chkconfig --add udev-retry
exit 0
@@ -277,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{udev_scriptdir}/mtd_probe
%attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-retry
%attr(0755,root,root) %dir %{_sysconfdir}/udev/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
%attr(0755,root,root) %dir %{udev_scriptdir}/
@@ -361,6 +360,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Wed Feb 16 2011 Harald Hoyer <harald at redhat.com> 166-1
+- renamed udev-post initscript to udev-retry to match
+ upstream systemd service name
+- version 166
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 164-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list