[Xen-changelog] Add installation of the udev rules if appropriate. With a normal 'make

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 409cea2432fc968fed8b5a3b29246942f4068cdb
# Parent  e9e10e783ccd7f7dfaf5443fcdaf8394c5c2a65e
Add installation of the udev rules if appropriate.  With a normal 'make
install', the udev rules will be installed if udev version is >= 059;
otherwise, the hotplug rules get installed.

When 'make dist' is done, we set a variable so that both hotplug and
udev rules are installed into the dist tarball.  install.sh then takes
care of picking the proper rules.

Also changes the hotplug check to look for a proper udev version

Signed-off-by: Jeremy Katz <katzj@xxxxxxxxxx>

diff -r e9e10e783ccd -r 409cea2432fc install.sh
--- a/install.sh        Fri Oct  7 12:34:45 2005
+++ b/install.sh        Fri Oct  7 13:47:45 2005
@@ -23,9 +23,15 @@
 fi
 
 echo "Installing Xen from '$src' to '$dst'..."
-(cd $src; tar -cf - --exclude etc/init.d * ) | tar -C $dst -xf -
+(cd $src; tar -cf - --exclude etc/init.d --exclude etc/hotplug --exclude 
etc/udev * ) | tar -C $dst -xf -
 cp -fdRL $src/etc/init.d/* $dst/etc/init.d/
 echo "All done."
+
+if [ -x /sbin/udev ] && [ ! -z `udev -V` ] && [ `/sbin/udev -V` -ge 059 ]; then
+  cp -f $src/etc/udev/rules.d/*.rules $dst/etc/udev/rules.d/
+else
+  cp -f $src/etc/hotplug/*.agent $dst/etc/hotplug/
+fi
 
 echo "Checking to see whether prerequisite tools are installed..."
 cd $src/../check
diff -r e9e10e783ccd -r 409cea2432fc tools/check/check_hotplug
--- a/tools/check/check_hotplug Fri Oct  7 12:34:45 2005
+++ b/tools/check/check_hotplug Fri Oct  7 13:47:45 2005
@@ -7,4 +7,8 @@
    exit 1
 }
 
+if [ -x /sbin/udev ] && [ ! -z `udev -V` ] && [ `udev -V` -ge 059 ]; then
+  exit 0
+fi
+
 which hotplug 1>/dev/null 2>&1 || error
diff -r e9e10e783ccd -r 409cea2432fc tools/examples/Makefile
--- a/tools/examples/Makefile   Fri Oct  7 12:34:45 2005
+++ b/tools/examples/Makefile   Fri Oct  7 13:47:45 2005
@@ -28,10 +28,23 @@
 XEN_HOTPLUG_DIR = /etc/hotplug
 XEN_HOTPLUG_SCRIPTS = xen-backend.agent
 
+UDEV_RULES_DIR = /etc/udev/rules.d
+UDEV_RULES = xen-backend.rules
+
+ifeq ($(findstring $(DISTDIR),$(DESTDIR)),$(DISTDIR))
+HOTPLUGS=install-hotplug install-udev
+else
+ifeq ($(shell [ -x /sbin/udev ] && [ ! -z `udev -V` ] && [ `/sbin/udev -V` -ge 
059 ] && echo 1),1)
+HOTPLUGS=install-udev
+else
+HOTPLUGS=install-hotplug
+endif
+endif
+
 all:
 build:
 
-install: all install-initd install-configs install-scripts install-hotplug
+install: all install-initd install-configs install-scripts $(HOTPLUGS)
 
 install-initd:
        [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
@@ -64,4 +77,12 @@
            $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_HOTPLUG_DIR); \
        done
 
+install-udev:
+       [ -d $(DESTDIR)$(UDEV_RULES_DIR) ] || \
+               $(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)
+       for i in $(UDEV_RULES); \
+           do \
+           $(INSTALL_PROG) $$i $(DESTDIR)$(UDEV_RULES_DIR); \
+       done
+
 clean:

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