[Xen-changelog] [xen-unstable] pv-on-hvm: Adjust mkbuildtree to handle pv_ops header placement

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1255505396 -3600
# Node ID bc6fe0a7622ac677e17007b1429f851dc329b805
# Parent  5d779377a9ae1c9ed1eda30d24b52314ca1894a3
pv-on-hvm: Adjust mkbuildtree to handle pv_ops header placement

Due to the movement of the arch include directories, we need to adjust
where mkbuildtree looks for headers when building the pv drivers.
Also add a check for the location of features.c

Signed-off-by: Charles Arnold <carnold@xxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/mkbuildtree |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff -r 5d779377a9ae -r bc6fe0a7622a unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Mon Oct 12 12:56:00 2009 +0100
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Wed Oct 14 08:29:56 2009 +0100
@@ -33,7 +33,11 @@ done
 done
 
 ln -sf ${XL}/drivers/xen/core/gnttab.c platform-pci
-ln -sf ${XL}/drivers/xen/core/features.c platform-pci
+if [ -f ${XL}/drivers/xen/core/features.c ]; then
+    ln -sf ${XL}/drivers/xen/core/features.c platform-pci
+else
+    ln -sf ${XL}/drivers/xen/features.c platform-pci
+fi
 ln -sf ${XL}/drivers/xen/core/xen_proc.c xenbus
 ln -sf ${XL}/drivers/xen/core/reboot.c platform-pci
 
@@ -47,7 +51,14 @@ ln -nsf ${XEN}/include/public include/xe
 # be native and not xenolinux).
 case "$uname" in
 i[34567]86|x86_64)
-    if [ -d ${XL}/include/asm-x86 ]; then
+    if [ -d ${XL}/arch/x86/include/mach-xen ]; then
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypervisor.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypercall*.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/synch_bitops*.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/maddr*.h include/asm
+        ln -sf ${XL}/arch/x86/include/mach-xen/asm/gnttab_dma.h include/asm
+        ln -sf ${XL}/arch/x86/lib/scrub.c balloon
+    elif [ -d ${XL}/include/asm-x86 ]; then
         ln -sf ${XL}/include/asm-x86/mach-xen/asm/hypervisor.h include/asm
         ln -sf ${XL}/include/asm-x86/mach-xen/asm/hypercall*.h include/asm
         ln -sf ${XL}/include/asm-x86/mach-xen/asm/synch_bitops*.h include/asm

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