[udev] - version 164 - skip start_udev with systemd

[Harald Hoyer]

commit 8fcb6e53edbe03b884264d643e56562732df50e2
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Oct 29 10:55:52 2010 +0200

    - version 164
    - skip start_udev with systemd

 .gitignore |    2 ++
 sources    |    4 ++--
 start_udev |    4 ++++
 udev.spec  |   59 +++++++++++------------------------------------------------
 4 files changed, 19 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22be2f6..65d08f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 udev-160.tar.bz2
+/udev-164.tar.bz2
+/udev-164.tar.bz2.sign
diff --git a/sources b/sources
index f53200e..8dc2880 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2f42aff9f8c7258fecde71df321032b7  udev-161.tar.bz2.sign
-95b6a0ffc9913f3e8021c65f51eb4f88  udev-161.tar.bz2
+cd285a85f969518a671834de2f4d6614  udev-164.tar.bz2
+43b3842a00854e712b1d58af3a03e4ed  udev-164.tar.bz2.sign
diff --git a/start_udev b/start_udev
index 49fc286..ebb9cb6 100755
--- a/start_udev
+++ b/start_udev
@@ -22,6 +22,10 @@
 #
 # don't use udev if sysfs is not mounted.
 
+# if we run with systemctl, just wait for settle
+if [ -x "$(type -P systemctl)" ]; then
+	systemctl start udev-settle.service &>/dev/null && exit 0
+fi
 
 export TZ=/etc/localtime
 
diff --git a/udev.spec b/udev.spec
index d727903..d38aa03 100644
--- a/udev.spec
+++ b/udev.spec
@@ -6,8 +6,8 @@
 
 Summary: A rule-based device node and kernel event manager
 Name: udev
-Version: 161
-Release: 4%{?dist}
+Version: 164
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -17,29 +17,6 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t
 Source1: start_udev
 Source2: udev-post.init
 
-Patch1: 0001-cdrom_id-Add-media-status-debugging.patch
-Patch2: 0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch
-Patch3: 0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch
-Patch4: 0004-init-update-systemd-service-files.patch
-Patch5: 0005-init-update-systemd-service-files.patch
-Patch6: 0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch
-Patch7: 0007-init-add-udev-to-description-in-systemd-service-file.patch
-Patch8: 0008-udevd-add-pid-to-kmsg-logs.patch
-Patch9: 0009-init-edit-systemd-service-descriptions.patch
-Patch11: 0011-udev-7-Point-out-required-extension-and-remove-some-.patch
-Patch12: 0012-keymap-Add-Onkyo-PC.patch
-Patch13: 0013-keymap-Add-HP-G60.patch
-Patch14: 0014-udevd-remove-unneeded-credential-passing-from-init_n.patch
-Patch15: 0015-Add-support-for-oom_score_adj.patch
-Patch16: 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch
-Patch17: 0017-udev-7-manpage-Fix-description-of-attr.patch
-Patch18: 0018-gudev-fix-crash-if-netlink-is-not-available.patch
-Patch19: 0019-keymap-Fix-Acer-TravelMate-4720.patch
-Patch20: 0020-cdrom_id-Fix-DVD-RW-media-detection.patch
-Patch21: 0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch
-Patch22: 0022-set-SELinux-context-on-add-but-not-on-change-events.patch
-Patch23: 0023-do-not-create-persistent-name-rules-for-KVM-network-.patch
-
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,28 +113,6 @@ glib-based applications using libudev functionality.
 
 %prep 
 %setup -q 
-%patch1 -p1 -b .git1
-%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
-%patch11 -p1 -b .git11
-%patch12 -p1 -b .git12
-%patch13 -p1 -b .git13
-%patch14 -p1 -b .git14
-%patch15 -p1 -b .git15
-%patch16 -p1 -b .git16
-%patch17 -p1 -b .git17
-%patch18 -p1 -b .git18
-%patch19 -p1 -b .git19
-%patch20 -p1 -b .git20
-%patch21 -p1 -b .git21
-%patch22 -p1 -b .git22
-%patch23 -p1 -b .git23
 
 %build
 libtoolize -f -c
@@ -354,6 +309,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service
 %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service
 %attr(0644,root,root) %{systemdsystemunitdir}/udev.service
+%{systemdsystemunitdir}/basic.target.wants/udev-retry.service
+%{systemdsystemunitdir}/basic.target.wants/udev-settle.service
+%{systemdsystemunitdir}/basic.target.wants/udev.service
+
 
 # Deprecated, but keep the ownership
 %ghost %dir /var/lib/udev
@@ -378,7 +337,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgudev1
 %defattr(0644, root, root, 0755)
 %doc extras/gudev/COPYING
-%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.*
+%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.*
 %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib
 
 %files -n libgudev1-devel
@@ -394,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Oct 29 2010 Harald Hoyer <harald at redhat.com> 164-1
+- version 164
+- skip start_udev with systemd
+
 * Wed Sep 29 2010 jkeating - 161-4
 - Rebuilt for gcc bug 634757