diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-10-14 08:29:56 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-10-14 08:29:56 +0100 |
| commit | 49d46b98d65b702693e2300337de8349422866cb (patch) | |
| tree | 10081e943676ec6cbadb4921a0bcfbf1b3b4bad0 /unmodified_drivers | |
| parent | 5a153a9f8ca72b91d05aa123fedfe11a582a56f4 (diff) | |
| download | xen-49d46b98d65b702693e2300337de8349422866cb.tar.gz xen-49d46b98d65b702693e2300337de8349422866cb.tar.bz2 xen-49d46b98d65b702693e2300337de8349422866cb.zip | |
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@novell.com>
Diffstat (limited to 'unmodified_drivers')
| -rwxr-xr-x | unmodified_drivers/linux-2.6/mkbuildtree | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree index 3c1c799c85..3aca16d6b0 100755 --- a/unmodified_drivers/linux-2.6/mkbuildtree +++ b/unmodified_drivers/linux-2.6/mkbuildtree @@ -33,7 +33,11 @@ for d in $(find ${XL}/drivers/xen/ -mindepth 1 -maxdepth 1 -type d); do 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/xen/interface # 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 |