[Xen-changelog] [xen-unstable] stubdom: Install and use stubdompath.sh

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1247500253 -3600
# Node ID 82c6d0b8852e17ae553992c0bc1a9addd5f59c22
# Parent  75e63b73075a7bb89db61219dd6cdd91b423ea2f
stubdom: Install and use stubdompath.sh
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 stubdom/Makefile   |   12 ++++++------
 stubdom/stubdom-dm |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff -r 75e63b73075a -r 82c6d0b8852e stubdom/Makefile
--- a/stubdom/Makefile  Mon Jul 13 16:49:50 2009 +0100
+++ b/stubdom/Makefile  Mon Jul 13 16:50:53 2009 +0100
@@ -82,11 +82,11 @@ genpath-target = $(call buildmakevars2fi
 $(eval $(genpath-target))
 
 .PHONY: all
-all: genpath build
+all: build
 ifeq ($(STUBDOM_SUPPORTED),1)
-build: ioemu-stubdom c-stubdom pv-grub
+build: genpath ioemu-stubdom c-stubdom pv-grub
 else
-build:
+build: genpath
 endif
 
 ##############
@@ -344,9 +344,9 @@ pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub
 #########
 
 ifeq ($(STUBDOM_SUPPORTED),1)
-install: install-readme install-ioemu install-grub
+install: genpath install-readme install-ioemu install-grub
 else
-install:
+install: genpath
 endif
 
 install-readme:
@@ -355,7 +355,7 @@ install-readme:
 
 install-ioemu: ioemu-stubdom
        $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
-       $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
+       $(INSTALL_PROG) stubdompath.sh stubdom-dm "$(DESTDIR)$(LIBEXEC)"
        $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
        $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz 
"$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
 
diff -r 75e63b73075a -r 82c6d0b8852e stubdom/stubdom-dm
--- a/stubdom/stubdom-dm        Mon Jul 13 16:49:50 2009 +0100
+++ b/stubdom/stubdom-dm        Mon Jul 13 16:50:53 2009 +0100
@@ -5,8 +5,8 @@
 # dm script around stubdomains.
 #
 
-XEN_CONFIG_DIR="/etc/xen"
-XENFIRMWAREDIR="/usr/lib/xen/boot"
+DIR=`dirname $0`
+. "${DIR}/stubdompath.sh"
 stubdom_configdir="${XEN_CONFIG_DIR}/stubdoms"
 
 # To fit xterms nicely

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