[Xen-changelog] [xen-unstable] pv-on-hvm: Allow Linux and Xen paths to be overridden by the environment.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1181148579 -3600
# Node ID f5a71c9771a81f220926ac11e4c9a2a27530c20a
# Parent  736e7cf0a3a5b6472c4f70c40a0fbc06aeaa9681
pv-on-hvm: Allow Linux and Xen paths to be overridden by the environment.
Signed-off-by: Ben Guthro <bguthro@xxxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/README      |   10 ++++++++--
 unmodified_drivers/linux-2.6/mkbuildtree |   13 +++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff -r 736e7cf0a3a5 -r f5a71c9771a8 unmodified_drivers/linux-2.6/README
--- a/unmodified_drivers/linux-2.6/README       Wed Jun 06 17:32:58 2007 +0100
+++ b/unmodified_drivers/linux-2.6/README       Wed Jun 06 17:49:39 2007 +0100
@@ -1,6 +1,12 @@ To build, run ./mkbuildtree and then
-To build, run ./mkbuildtree and then
+To build:
 
-make -C /path/to/kernel/source M=$PWD modules
+1. ./mkbuildtree
+   NB. You can override paths to Xen sources and XenLinux sources via
+       the XEN and XL environment variable.
+
+2. make -C /path/to/kernel/source M=$PWD modules
+   NB. The kernel sources here are your native kernel build tree, not
+       the XenLinux sources referred to in step 1.
 
 You get four modules, xen-platform-pci.ko, xenbus.ko, xen-vbd.ko, and
 xen-vnif.ko.  Load xen-platform-pci first, then xenbus, and then
diff -r 736e7cf0a3a5 -r f5a71c9771a8 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Wed Jun 06 17:32:58 2007 +0100
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Wed Jun 06 17:49:39 2007 +0100
@@ -10,8 +10,17 @@ fi
 
 C=$PWD
 
-XEN=$C/../../xen
-XL=$C/../../../linux-2.6.18-xen.hg
+if [ -n "$XEN" -a -d "$XEN" ]; then
+  XEN=$(cd $XEN && pwd)
+else
+  XEN=$C/../../xen
+fi
+
+if [ -n "$XL" -a -d "$XL" ]; then
+  XL=$(cd $XL && pwd)
+else
+  XL=$C/../../linux-2.6.18-xen.hg
+fi
 
 for d in $(find ${XL}/drivers/xen/ -maxdepth 1 -type d | sed -e 1d); do
     if ! echo $d | egrep -q back; then

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