debuggers.hg

changeset 19972:82c6d0b8852e

stubdom: Install and use stubdompath.sh
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Jul 13 16:50:53 2009 +0100 (2009-07-13)
parents 75e63b73075a
children 42795382cb93
files stubdom/Makefile stubdom/stubdom-dm
line diff
     1.1 --- a/stubdom/Makefile	Mon Jul 13 16:49:50 2009 +0100
     1.2 +++ b/stubdom/Makefile	Mon Jul 13 16:50:53 2009 +0100
     1.3 @@ -82,11 +82,11 @@ genpath-target = $(call buildmakevars2fi
     1.4  $(eval $(genpath-target))
     1.5  
     1.6  .PHONY: all
     1.7 -all: genpath build
     1.8 +all: build
     1.9  ifeq ($(STUBDOM_SUPPORTED),1)
    1.10 -build: ioemu-stubdom c-stubdom pv-grub
    1.11 +build: genpath ioemu-stubdom c-stubdom pv-grub
    1.12  else
    1.13 -build:
    1.14 +build: genpath
    1.15  endif
    1.16  
    1.17  ##############
    1.18 @@ -344,9 +344,9 @@ pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub
    1.19  #########
    1.20  
    1.21  ifeq ($(STUBDOM_SUPPORTED),1)
    1.22 -install: install-readme install-ioemu install-grub
    1.23 +install: genpath install-readme install-ioemu install-grub
    1.24  else
    1.25 -install:
    1.26 +install: genpath
    1.27  endif
    1.28  
    1.29  install-readme:
    1.30 @@ -355,7 +355,7 @@ install-readme:
    1.31  
    1.32  install-ioemu: ioemu-stubdom
    1.33  	$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
    1.34 -	$(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
    1.35 +	$(INSTALL_PROG) stubdompath.sh stubdom-dm "$(DESTDIR)$(LIBEXEC)"
    1.36  	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
    1.37  	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
    1.38  
     2.1 --- a/stubdom/stubdom-dm	Mon Jul 13 16:49:50 2009 +0100
     2.2 +++ b/stubdom/stubdom-dm	Mon Jul 13 16:50:53 2009 +0100
     2.3 @@ -5,8 +5,8 @@
     2.4  # dm script around stubdomains.
     2.5  #
     2.6  
     2.7 -XEN_CONFIG_DIR="/etc/xen"
     2.8 -XENFIRMWAREDIR="/usr/lib/xen/boot"
     2.9 +DIR=`dirname $0`
    2.10 +. "${DIR}/stubdompath.sh"
    2.11  stubdom_configdir="${XEN_CONFIG_DIR}/stubdoms"
    2.12  
    2.13  # To fit xterms nicely