1.1 --- a/linux-2.6-xen-sparse/arch/ia64/Makefile	Wed Sep 21 09:06:30 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Makefile	Wed Sep 21 09:50:38 2005 -0600
     1.3 @@ -87,9 +87,9 @@ archclean:
     1.4  	$(Q)$(MAKE) $(clean)=$(boot)
     1.5  
     1.6  CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
     1.7 -CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
     1.8 -CLEAN_FILES += include/asm-xen/linux-public/xenstored.h
     1.9 -CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
    1.10 +#CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
    1.11 +#CLEAN_FILES += include/asm-xen/linux-public/xenstored.h
    1.12 +#CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
    1.13  
    1.14  MRPROPER_FILES += include/asm-ia64/offsets.h
    1.15  
    1.16 @@ -102,7 +102,7 @@ include/asm-ia64/offsets.h: arch/ia64/ke
    1.17  
    1.18  arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
    1.19  
    1.20 -XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
    1.21 +#XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
    1.22  include/asm-ia64/.offsets.h.stamp:
    1.23  	mkdir -p include/asm-ia64
    1.24  	[ -s include/asm-ia64/offsets.h ] \
    1.25 @@ -110,14 +110,14 @@ include/asm-ia64/.offsets.h.stamp:
    1.26  	touch $@
    1.27  	[ -e include/asm-xen/asm ] \
    1.28  	 || ln -s asm-ia64 include/asm-xen/asm
    1.29 -	[ -e include/asm-xen/xen-public ] \
    1.30 -	 || ln -s $(XEN_PATH)/xen/include/public \
    1.31 -		include/asm-xen/xen-public
    1.32 -	[ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
    1.33 -	 || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
    1.34 -		include/asm-ia64/xen/asm-xsi-offsets.h
    1.35 -	[ -e include/asm-xen/linux-public ] \
    1.36 -	 || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
    1.37 +#	[ -e include/asm-xen/xen-public ] \
    1.38 +#	 || ln -s $(XEN_PATH)/xen/include/public \
    1.39 +#		include/asm-xen/xen-public
    1.40 +#	[ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
    1.41 +#	 || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
    1.42 +#		include/asm-ia64/xen/asm-xsi-offsets.h
    1.43 +#	[ -e include/asm-xen/linux-public ] \
    1.44 +#	 || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
    1.45  		include/asm-xen/linux-public
    1.46  	[ -e include/asm-xen/linux-public/xenstored.h ] \
    1.47  	 || ln -s $(XEN_PATH)/tools/xenstore/xenstored.h \

     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Wed Sep 21 09:06:30 2005 -0600
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Wed Sep 21 09:50:38 2005 -0600
     2.3 @@ -1,9 +1,14 @@
     2.4 -mv arch/xen/kernel drivers/xen/core
     2.5 -mv mm mm.x86
     2.6 -mv net net.x86
     2.7 -mv kernel kernel.x86
     2.8 -mv arch/xen arch/xen.x86
     2.9 -mkdir arch/xen
    2.10 -mv arch/xen.x86/configs arch/xen
    2.11 -mv include/asm-generic include/asm-generic.x86
    2.12 -mv include/linux include/linux.x86
    2.13 +#!/bin/bash
    2.14 +if [ -e mm ]
    2.15 +then
    2.16 +	mv mm mm.x86
    2.17 +	mv net net.x86
    2.18 +	mv kernel kernel.x86
    2.19 +	mv arch/xen/kernel drivers/xen/core
    2.20 +	mv arch/xen arch/xen.x86
    2.21 +	mkdir arch/xen
    2.22 +	mv arch/xen.x86/configs arch/xen
    2.23 +	mv include/asm-generic include/asm-generic.x86
    2.24 +	mv include/linux include/linux.x86
    2.25 +fi
    2.26 +cp ../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/