[Xen-changelog] Build tweaks for xenlinux/ia64

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

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 0817cde2ca06f4a44d82a21dd19f672b3ecd2906
# Parent  3b6d422fc0bed307a82377738af065cf764d17f7
Build tweaks for xenlinux/ia64

diff -r 3b6d422fc0be -r 0817cde2ca06 linux-2.6-xen-sparse/arch/ia64/Makefile
--- a/linux-2.6-xen-sparse/arch/ia64/Makefile   Wed Sep 21 15:06:30 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/Makefile   Wed Sep 21 15:50:38 2005
@@ -87,9 +87,9 @@
        $(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 @@
 
 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 @@
        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 -r 3b6d422fc0be -r 0817cde2ca06 
linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre        Wed Sep 21 
15:06:30 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre        Wed Sep 21 
15:50:38 2005
@@ -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/

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