[Xen-changelog] [xen-unstable] Fix buildsystem to detect udev > version 124

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245931357 -3600
# Node ID edfdeb150f27d195a616c9d50065abdb31af4dfa
# Parent  edd603e77be42d1f4ceae7f0d8b7140320dd2cee
Fix buildsystem to detect udev > version 124

udev removed the udevinfo symlink from versions higher than 123 and
xen's build-system could not detect if udev is in place and has the
required version.

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

diff -r edd603e77be4 -r edfdeb150f27 install.sh
--- a/install.sh        Thu Jun 25 12:59:46 2009 +0100
+++ b/install.sh        Thu Jun 25 13:02:37 2009 +0100
@@ -30,6 +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)
+
 if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
   echo " - installing for udev-based system"
   rm -rf "$tmp/etc/hotplug"
diff -r edd603e77be4 -r edfdeb150f27 tools/check/check_udev
--- a/tools/check/check_udev    Thu Jun 25 12:59:46 2009 +0100
+++ b/tools/check/check_udev    Thu Jun 25 13:02:37 2009 +0100
@@ -8,8 +8,10 @@ OpenBSD|NetBSD|FreeBSD)
        has_or_fail vnconfig
        ;;
 Linux)
-       has_or_fail udevinfo
-       [ "`udevinfo -V | awk '{print $NF}'`" -ge 59 ] 2>/dev/null || \
+       has /sbin/udevadm && udevver=`/sbin/udevadm -V`
+       [ -z "$udevver" ] && has_or_fail udevinfo && \
+               udevver=`udevinfo -V | awk '{print $NF}'`
+       [ "$udevver" -ge 59 ] 2>/dev/null || \
                has hotplug || \
                fail "udev is too old, upgrade to version 59 or later"
        ;;
diff -r edd603e77be4 -r edfdeb150f27 tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Thu Jun 25 12:59:46 2009 +0100
+++ b/tools/hotplug/Linux/Makefile      Thu Jun 25 13:02:37 2009 +0100
@@ -24,6 +24,12 @@ XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
 XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
 XEN_HOTPLUG_SCRIPTS = xen-backend.agent
 
+ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1)
+UDEVINFO = /sbin/udevadm
+else
+UDEVINFO = /usr/bin/udevinfo
+endif
+
 UDEV_RULES_DIR = $(CONFIG_DIR)/udev
 UDEV_RULES = xen-backend.rules xend.rules
 
@@ -32,7 +38,7 @@ ifeq ($(findstring $(DI),$(DE)),$(DI))
 ifeq ($(findstring $(DI),$(DE)),$(DI))
 HOTPLUGS=install-hotplug install-udev
 else
-ifeq ($(shell [ -x /usr/bin/udevinfo ] && [ `/usr/bin/udevinfo -V | sed -e 
's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
+ifeq ($(shell [ -x $(UDEVINFO) -a `$(UDEVINFO) -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -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