[Xen-changelog] [xen-unstable] x86 hvm: stubdom and hvmloader always live under /usr/lib, never /usr/lib64

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1216709984 -3600
# Node ID f528dd7fae7beea62a6d8a597b0cb4909a6e49eb
# Parent  f95a37f2deab4a0624ff59585d2218c42cdcf4a8
x86 hvm: stubdom and hvmloader always live under /usr/lib, never /usr/lib64
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/examples/stubdom-ExampleHVMDomain |    9 +--------
 tools/examples/xmexample.hvm            |    2 +-
 tools/examples/xmexample.hvm-stubdom    |   11 ++---------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff -r f95a37f2deab -r f528dd7fae7b tools/examples/stubdom-ExampleHVMDomain
--- a/tools/examples/stubdom-ExampleHVMDomain   Mon Jul 21 16:24:19 2008 +0100
+++ b/tools/examples/stubdom-ExampleHVMDomain   Tue Jul 22 07:59:44 2008 +0100
@@ -1,14 +1,7 @@
 # Not to be started directly,
 # See xmexample.hvm-stubdom and stubdom/README for more details
 
-import os, re
-arch = os.uname()[4]
-if re.search('64', arch):
-    arch_libdir = 'lib64'
-else:
-    arch_libdir = 'lib'
-
-kernel = "/usr/" + arch_libdir + "/xen/boot/ioemu-stubdom.gz"
+kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
 
 # Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP
 # networking in the stubdomain itself, here just ''
diff -r f95a37f2deab -r f528dd7fae7b tools/examples/xmexample.hvm
--- a/tools/examples/xmexample.hvm      Mon Jul 21 16:24:19 2008 +0100
+++ b/tools/examples/xmexample.hvm      Tue Jul 22 07:59:44 2008 +0100
@@ -15,7 +15,7 @@ else:
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader"
+kernel = "/usr/lib/xen/boot/hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
diff -r f95a37f2deab -r f528dd7fae7b tools/examples/xmexample.hvm-stubdom
--- a/tools/examples/xmexample.hvm-stubdom      Mon Jul 21 16:24:19 2008 +0100
+++ b/tools/examples/xmexample.hvm-stubdom      Tue Jul 22 07:59:44 2008 +0100
@@ -10,16 +10,9 @@
 # stubdom-ExampleHVMDomain and stubdom/README for more details
 # The differences with xmexample.hvm are marked with "STUBDOM"
 
-import os, re
-arch = os.uname()[4]
-if re.search('64', arch):
-    arch_libdir = 'lib64'
-else:
-    arch_libdir = 'lib'
-
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader"
+kernel = "/usr/lib/xen/boot/hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
@@ -129,7 +122,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
 #
 # STUBDOM: this is a script that creates the stub domain running the device
 # model
-device_model = '/usr/' + arch_libdir + '/xen/bin/stubdom-dm'
+device_model = '/usr/lib/xen/bin/stubdom-dm'
 
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 

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