[Xen-changelog] [xen-unstable] buikd: Fix the detection of udev with udevadm version < 128

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1246530660 -3600
# Node ID c964dd391c7d8285ce34681754a267ac29ac349e
# Parent  80839a223746adfb3d7b7688085a84017fe3cf39
buikd: Fix the detection of udev with udevadm version < 128

Signed-off-by: Marc-A. Dahlhaus <mad@xxxxxx>
---
 install.sh                   |    3 ++-
 tools/check/check_udev       |    3 ++-
 tools/hotplug/Linux/Makefile |   10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff -r 80839a223746 -r c964dd391c7d install.sh
--- a/install.sh        Wed Jul 01 20:22:29 2009 +0100
+++ b/install.sh        Thu Jul 02 11:31:00 2009 +0100
@@ -30,7 +30,8 @@ echo "Installing Xen from '$src' to '$ds
 [ -x "$(which udevinfo)" ] && \
   UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
 
-[ -z "$UDEV_VERSION" -a -x /sbin/udevadm ] && UDEV_VERSION=$(/sbin/udevadm -V)
+[ -z "$UDEV_VERSION" -a -x /sbin/udevadm ] && \
+  UDEV_VERSION=$(/sbin/udevadm info -V | awk '{print $NF}')
 
 if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
   echo " - installing for udev-based system"
diff -r 80839a223746 -r c964dd391c7d tools/check/check_udev
--- a/tools/check/check_udev    Wed Jul 01 20:22:29 2009 +0100
+++ b/tools/check/check_udev    Thu Jul 02 11:31:00 2009 +0100
@@ -8,7 +8,8 @@ OpenBSD|NetBSD|FreeBSD)
        has_or_fail vnconfig
        ;;
 Linux)
-       has /sbin/udevadm && udevver=`/sbin/udevadm -V`
+       has /sbin/udevadm && \
+               udevver=`/sbin/udevadm info -V | awk '{print $NF}'`
        [ -z "$udevver" ] && has_or_fail udevinfo && \
                udevver=`udevinfo -V | awk '{print $NF}'`
        [ "$udevver" -ge 59 ] 2>/dev/null || \
diff -r 80839a223746 -r c964dd391c7d tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Wed Jul 01 20:22:29 2009 +0100
+++ b/tools/hotplug/Linux/Makefile      Thu Jul 02 11:31:00 2009 +0100
@@ -24,10 +24,12 @@ XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
 XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
 XEN_HOTPLUG_SCRIPTS = xen-backend.agent
 
+UDEVVER = 0
 ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1)
-UDEVINFO = /sbin/udevadm
-else
-UDEVINFO = /usr/bin/udevinfo
+UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
+endif
+ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1)
+UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
 endif
 
 UDEV_RULES_DIR = $(CONFIG_DIR)/udev
@@ -38,7 +40,7 @@ ifeq ($(findstring $(DI),$(DE)),$(DI))
 ifeq ($(findstring $(DI),$(DE)),$(DI))
 HOTPLUGS=install-hotplug install-udev
 else
-ifeq ($(shell [ -x $(UDEVINFO) -a `$(UDEVINFO) -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
+ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
 HOTPLUGS=install-udev
 else
 HOTPLUGS=install-hotplug

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog