aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>2005-09-21 09:50:38 -0600
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>2005-09-21 09:50:38 -0600
commit5e2849459275f4608864a4d03d309dd01ad9094c (patch)
treeba5531ab24bcf2150efcfbd565dbc1a58b3cd17d
parentfa4a47057d8cc325a0328ba6f7e99eaaa525e9c5 (diff)
downloadxen-5e2849459275f4608864a4d03d309dd01ad9094c.tar.gz
xen-5e2849459275f4608864a4d03d309dd01ad9094c.tar.bz2
xen-5e2849459275f4608864a4d03d309dd01ad9094c.zip
Build tweaks for xenlinux/ia64
-rw-r--r--linux-2.6-xen-sparse/arch/ia64/Makefile24
-rwxr-xr-xlinux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre23
2 files changed, 26 insertions, 21 deletions
diff --git a/linux-2.6-xen-sparse/arch/ia64/Makefile b/linux-2.6-xen-sparse/arch/ia64/Makefile
index c7a4d7eec7..e0751e9328 100644
--- a/linux-2.6-xen-sparse/arch/ia64/Makefile
+++ b/linux-2.6-xen-sparse/arch/ia64/Makefile
@@ -87,9 +87,9 @@ archclean:
$(Q)$(MAKE) $(clean)=$(boot)
CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
-CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
-CLEAN_FILES += include/asm-xen/linux-public/xenstored.h
-CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
+#CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
+#CLEAN_FILES += include/asm-xen/linux-public/xenstored.h
+#CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
MRPROPER_FILES += include/asm-ia64/offsets.h
@@ -102,7 +102,7 @@ include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
-XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
+#XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
include/asm-ia64/.offsets.h.stamp:
mkdir -p include/asm-ia64
[ -s include/asm-ia64/offsets.h ] \
@@ -110,14 +110,14 @@ include/asm-ia64/.offsets.h.stamp:
touch $@
[ -e include/asm-xen/asm ] \
|| ln -s asm-ia64 include/asm-xen/asm
- [ -e include/asm-xen/xen-public ] \
- || ln -s $(XEN_PATH)/xen/include/public \
- include/asm-xen/xen-public
- [ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
- || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
- include/asm-ia64/xen/asm-xsi-offsets.h
- [ -e include/asm-xen/linux-public ] \
- || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
+# [ -e include/asm-xen/xen-public ] \
+# || ln -s $(XEN_PATH)/xen/include/public \
+# include/asm-xen/xen-public
+# [ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
+# || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
+# include/asm-ia64/xen/asm-xsi-offsets.h
+# [ -e include/asm-xen/linux-public ] \
+# || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
include/asm-xen/linux-public
[ -e include/asm-xen/linux-public/xenstored.h ] \
|| ln -s $(XEN_PATH)/tools/xenstore/xenstored.h \
diff --git a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
index 382245494a..8dd4a0c049 100755
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
@@ -1,9 +1,14 @@
-mv arch/xen/kernel drivers/xen/core
-mv mm mm.x86
-mv net net.x86
-mv kernel kernel.x86
-mv arch/xen arch/xen.x86
-mkdir arch/xen
-mv arch/xen.x86/configs arch/xen
-mv include/asm-generic include/asm-generic.x86
-mv include/linux include/linux.x86
+#!/bin/bash
+if [ -e mm ]
+then
+ mv mm mm.x86
+ mv net net.x86
+ mv kernel kernel.x86
+ mv arch/xen/kernel drivers/xen/core
+ mv arch/xen arch/xen.x86
+ mkdir arch/xen
+ mv arch/xen.x86/configs arch/xen
+ mv include/asm-generic include/asm-generic.x86
+ mv include/linux include/linux.x86
+fi
+cp ../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/