[arch-commits] CVS update of core/base/klibc-udev (PKGBUILD start_udev udev_install)

[Tobias Powalowski]

    Date: Monday, March 10, 2008 @ 16:40:06
  Author: tpowa
    Path: /home/cvs-core/core/base/klibc-udev

Modified: PKGBUILD (1.37 -> 1.38) start_udev (1.2 -> 1.3)
          udev_install (1.5 -> 1.6)

'upgpkg: added changes for udevadm, please someone should try if it works else revert back to 116-3'


--------------+
 PKGBUILD     |    7 +++----
 start_udev   |    4 ++--
 udev_install |    3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)


Index: core/base/klibc-udev/PKGBUILD
diff -u core/base/klibc-udev/PKGBUILD:1.37 core/base/klibc-udev/PKGBUILD:1.38
--- core/base/klibc-udev/PKGBUILD:1.37	Sun Mar  9 18:19:48 2008
+++ core/base/klibc-udev/PKGBUILD	Mon Mar 10 16:40:05 2008
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.37 2008/03/09 22:19:48 tpowa Exp $
+# $Id: PKGBUILD,v 1.38 2008/03/10 20:40:05 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=klibc-udev
@@ -22,7 +22,7 @@
   sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile
 
   #I need to look at this... it appears the __CTYPE_NO_INLINE may be a klibc issue - aaron
-  make VOLUME_ID_STATIC=true CC=klcc LD=klcc PROGRAMS="udevd udevtrigger udevsettle" \
+  make VOLUME_ID_STATIC=true CC=klcc LD=klcc PROGRAMS="udevd udevadm" \
         CFLAGS="$CFLAGS -U__CTYPE_NO_INLINE" \
         EXTRAS="extras/firmware extras/cdrom_id extras/ata_id \
                 extras/edd_id extras/scsi_id extras/usb_id extras/volume_id" \
@@ -30,8 +30,7 @@
 
   mkdir -p $startdir/pkg/lib/initcpio/udev
   install -m755 udevd $startdir/pkg/lib/initcpio/udev
-  install -m755 udevtrigger  $startdir/pkg/lib/initcpio/udev
-  install -m755 udevsettle  $startdir/pkg/lib/initcpio/udev
+  install -m755 udevadm  $startdir/pkg/lib/initcpio/udev
   install -m755 extras/firmware/firmware.sh  $startdir/pkg/lib/initcpio/udev
   install -m755 extras/cdrom_id/cdrom_id  $startdir/pkg/lib/initcpio/udev
   install -m755 extras/ata_id/ata_id  $startdir/pkg/lib/initcpio/udev
Index: core/base/klibc-udev/start_udev
diff -u core/base/klibc-udev/start_udev:1.2 core/base/klibc-udev/start_udev:1.3
--- core/base/klibc-udev/start_udev:1.2	Mon Oct 16 01:45:43 2006
+++ core/base/klibc-udev/start_udev	Mon Mar 10 16:40:06 2008
@@ -31,7 +31,7 @@
 
 trigger_device_events () 
 {
-	/sbin/udevtrigger
+	/sbin/udevadm trigger
 }
 
 wait_for_queue () 
@@ -42,7 +42,7 @@
         #           sleep 0.1;
         #           loop=$(($loop - 1))
         #done
-	/sbin/udevsettle
+	/sbin/udevadm settle
 }
 
 make_extra_nodes () 
Index: core/base/klibc-udev/udev_install
diff -u core/base/klibc-udev/udev_install:1.5 core/base/klibc-udev/udev_install:1.6
--- core/base/klibc-udev/udev_install:1.5	Sat Mar 24 12:26:03 2007
+++ core/base/klibc-udev/udev_install	Mon Mar 10 16:40:06 2008
@@ -7,8 +7,7 @@
     FILES=" /etc/udev/udev.conf"
     SCRIPT="udev"
     add_file /lib/initcpio/udev/udevd /sbin/udevd
-    add_file /lib/initcpio/udev/udevtrigger /sbin/udevtrigger
-    add_file /lib/initcpio/udev/udevsettle /sbin/udevsettle
+    add_file /lib/initcpio/udev/udevadm /sbin/udevadm
     add_file /lib/initcpio/udev/udev.rules /etc/udev/rules.d/udev.rules
     add_file /lib/initcpio/udev/start_udev /etc/start_udev
     add_file /lib/initcpio/udev/firmware.sh /lib/udev/firmware.sh