[arch-commits] Commit in udev/trunk (PKGBUILD udev.install)

[Tom Gundersen]

    Date: Thursday, March 1, 2012 @ 12:33:17
  Author: tomegun
Revision: 151727

upgpkg: udev 181-3

symlink /sbin/udevadm to avoid regressions

Modified:
  udev/trunk/PKGBUILD
  udev/trunk/udev.install

--------------+
 PKGBUILD     |   10 +++++++---
 udev.install |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-01 17:29:19 UTC (rev 151726)
+++ PKGBUILD	2012-03-01 17:33:17 UTC (rev 151727)
@@ -6,9 +6,9 @@
 
 pkgname=udev
 pkgver=181
-pkgrel=2
+pkgrel=3
 pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils')
+depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils' 'acl')
 install=udev.install
 arch=(i686 x86_64)
 license=('GPL')
@@ -40,8 +40,12 @@
   make DESTDIR=${pkgdir} install
 
   # udevd moved, symlink to make life easy for restarting udevd manually
-  ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd
+  ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd
 
+  # the path to udevadm is hardcoded in some places
+  install -d ${pkgdir}/sbin
+  ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm
+
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   for i in $pkgdir/lib/udev/rules.d/*.rules; do
     sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;

Modified: udev.install
===================================================================
--- udev.install	2012-03-01 17:29:19 UTC (rev 151726)
+++ udev.install	2012-03-01 17:33:17 UTC (rev 151727)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 post_upgrade() {
-  if [ "$(vercmp $2 182)" -lt 0 ]; then
+  if [ "$(vercmp $2 181-2)" -lt 0 ]; then
     echo "udev changes:"
     if [ "$(vercmp $2 168)" -lt 0 ]; then
       echo " * Kernel 2.6.32 or newer is now required."