diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-07-13 16:50:53 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-07-13 16:50:53 +0100 |
| commit | 71d2c144a7c828411ffb5e17e9a5e08b42f09e15 (patch) | |
| tree | 8f13872a2bc302482b995cf7b99f4636899e8ff5 /stubdom | |
| parent | 700ac7a490b46d5ddc1e730c971bc6f7ec9d70ca (diff) | |
| download | xen-71d2c144a7c828411ffb5e17e9a5e08b42f09e15.tar.gz xen-71d2c144a7c828411ffb5e17e9a5e08b42f09e15.tar.bz2 xen-71d2c144a7c828411ffb5e17e9a5e08b42f09e15.zip | |
stubdom: Install and use stubdompath.sh
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'stubdom')
| -rw-r--r-- | stubdom/Makefile | 12 | ||||
| -rw-r--r-- | stubdom/stubdom-dm | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile index ace9bf7ada..26811943f5 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -82,11 +82,11 @@ genpath-target = $(call buildmakevars2file,$(STUBDOMPATH)) $(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 libxc 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 --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm index b163df2222..c138e00945 100644 --- a/stubdom/stubdom-dm +++ b/stubdom/stubdom-dm @@ -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 |