diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-09-14 09:14:32 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-09-14 09:14:32 +0000 |
| commit | d356ca1e9305329452559a4da8f5660622ea9ba3 (patch) | |
| tree | 58f899ed09dd90bcea411265a4e3b07d5159fe4d /tools | |
| parent | 2c0ba8d0753536c7cd9651b0326bcfabd2d20e18 (diff) | |
| download | xen-d356ca1e9305329452559a4da8f5660622ea9ba3.tar.gz xen-d356ca1e9305329452559a4da8f5660622ea9ba3.tar.bz2 xen-d356ca1e9305329452559a4da8f5660622ea9ba3.zip | |
mem-map.sxp and vmxloader are unaffected by a 64-bit build,
and belong in /usr/lib always (never /usr/lib64). qemu-dm
continues to live under /usr/lib64 on 64-bit systems.
Modify the vmx config script to auto-detect correct path
to qemu-dm, rather than staically configuring at compile
time.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/examples/Makefile | 10 | ||||
| -rw-r--r-- | tools/examples/xmexample.vmx (renamed from tools/examples/xmexample.vmx.in) | 14 | ||||
| -rw-r--r-- | tools/firmware/Makefile | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 5bfa67fd9f..0a086c572c 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -25,21 +25,20 @@ XEN_SCRIPTS += block-phy XEN_SCRIPTS += block-file XEN_SCRIPTS += block-enbd -XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot +# no 64-bit specifics in mem-map.sxp +# so place in /usr/lib, not /usr/lib64 +XEN_BOOT_DIR = /usr/lib/xen/boot XEN_BOOT = mem-map.sxp XEN_HOTPLUG_DIR = /etc/hotplug XEN_HOTPLUG_SCRIPTS = xen-backend.agent -all: +all: build: install: all install-initd install-configs install-scripts install-boot \ install-hotplug -xmexample.vmx: xmexample.vmx.in - sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@ - install-initd: [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d @@ -80,4 +79,3 @@ install-hotplug: done clean: - $(RM) xmexample.vmx diff --git a/tools/examples/xmexample.vmx.in b/tools/examples/xmexample.vmx index c45a237033..28f34462fd 100644 --- a/tools/examples/xmexample.vmx.in +++ b/tools/examples/xmexample.vmx @@ -6,9 +6,16 @@ # you can set the parameters for the domain on the xm command line. #============================================================================ +import os, re +arch = os.uname()[4] +if re.search('64', arch): + arch_libdir = 'lib64' +else: + arch_libdir = 'lib' + #---------------------------------------------------------------------------- # Kernel image file. -kernel = "/usr/@@LIBDIR@@/xen/boot/vmxloader" +kernel = "/usr/lib/xen/boot/vmxloader" # The domain build function. VMX domain uses 'vmx'. builder='vmx' @@ -46,12 +53,11 @@ disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ] #============================================================================ - # New stuff -device_model = '/usr/@@LIBDIR@@/xen/bin/qemu-dm' +device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' # Advanced users only. Don't touch if you don't know what you're doing -memmap = '/usr/@@LIBDIR@@/xen/boot/mem-map.sxp' +memmap = '/usr/lib/xen/boot/mem-map.sxp' #----------------------------------------------------------------------------- # Disk image for diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index e972544eea..86918f5443 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -1,6 +1,8 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk +# vmxloader is a 32-bit protected mode binary. +# It belongs in /usr/lib, not /usr/lib64. TARGET := vmxassist/vmxloader INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot |