ia64/xen-unstable

changeset 8357:6691252943d1

Revert changes slipped in during merge.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author chris@ubuntu.eng.hq.xensource.com
date Tue Dec 13 19:11:27 2005 -0700 (2005-12-13)
parents d48b19263e46
children 050333773f09
files .hgignore Config.mk buildconfigs/mk.linux-2.6-xen
line diff
     1.1 --- a/.hgignore	Tue Dec 13 19:05:57 2005 -0700
     1.2 +++ b/.hgignore	Tue Dec 13 19:11:27 2005 -0700
     1.3 @@ -10,7 +10,6 @@
     1.4  .*\.tar\.bz2$
     1.5  .*\.tar\.gz$
     1.6  .*~$
     1.7 -^build.*$
     1.8  ^dist/.*$
     1.9  ^docs/.*\.aux$
    1.10  ^docs/.*\.dvi$
     2.1 --- a/Config.mk	Tue Dec 13 19:05:57 2005 -0700
     2.2 +++ b/Config.mk	Tue Dec 13 19:11:27 2005 -0700
     2.3 @@ -3,7 +3,7 @@
     2.4  # Currently supported architectures: x86_32, x86_64
     2.5  XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     2.6  XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
     2.7 -XEN_TARGET_X86_PAE  ?= y
     2.8 +XEN_TARGET_X86_PAE  ?= n
     2.9  
    2.10  # Tools to run on system hosting the build
    2.11  HOSTCC     = gcc
     3.1 --- a/buildconfigs/mk.linux-2.6-xen	Tue Dec 13 19:05:57 2005 -0700
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen	Tue Dec 13 19:11:27 2005 -0700
     3.3 @@ -6,8 +6,7 @@ LINUX_VER    = 2.6.12
     3.4  
     3.5  EXTRAVERSION ?= xen
     3.6  
     3.7 -LINUX_SRCDIR = $(OS)-$(LINUX_VER)-xen
     3.8 -LINUX_DIR    = build-$(OS)-$(LINUX_VER)-$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
     3.9 +LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
    3.10  
    3.11  include buildconfigs/Rules.mk
    3.12  
    3.13 @@ -21,32 +20,25 @@ build: $(LINUX_DIR)/include/linux/autoco
    3.14  	fi
    3.15  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
    3.16  
    3.17 -$(LINUX_SRCDIR)/.valid-src: ref-$(OS)-$(LINUX_VER)/.valid-ref
    3.18 -	rm -rf $(LINUX_SRCDIR)
    3.19 -	cp -al $(<D) $(LINUX_SRCDIR)
    3.20 +$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
    3.21 +	rm -rf $(LINUX_DIR)
    3.22 +	cp -al $(<D) $(LINUX_DIR)
    3.23  	# Apply arch-xen patches
    3.24  	( cd linux-$(LINUX_SERIES)-xen-sparse ; \
    3.25 -          LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_SRCDIR) )
    3.26 -	# Patch kernel Makefile to set EXTRAVERSION
    3.27 -	( cd $(LINUX_SRCDIR) ; \
    3.28 -	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)/' \
    3.29 -	      -e 's,^KERNELRELEASE=,XENGUEST := $$(shell [ -r $$(objtree)/.xenguest ] \&\& cat $$(objtree)/.xenguest)\n&,' Makefile >Mk.tmp ; \
    3.30 -	  rm -f Makefile ; mv Mk.tmp Makefile )
    3.31 -	touch $@
    3.32 -
    3.33 -$(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src
    3.34 -	rm -rf $(LINUX_DIR)
    3.35 -	mkdir -p $(LINUX_DIR)
    3.36 +          LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_DIR) )
    3.37  	# Re-use config from install dir if one exits else use default config
    3.38 -	CONFIG_VERSION=$$(sed -ne 's/$$(XENGUEST)//; s/^EXTRAVERSION = //p' $(LINUX_SRCDIR)/Makefile); \
    3.39 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    3.40  	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    3.41  	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    3.42 -	  || cp $(LINUX_SRCDIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
    3.43 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
    3.44  		$(LINUX_DIR)/.config
    3.45  	# See if we need to munge config to enable PAE
    3.46  	$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
    3.47 -	echo "-$(EXTRAVERSION)" >$(LINUX_DIR)/.xenguest
    3.48 -	$(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) oldconfig O=$$(/bin/pwd)/$(LINUX_DIR)
    3.49 +	# Patch kernel Makefile to set EXTRAVERSION
    3.50 +	( cd $(LINUX_DIR) ; \
    3.51 +	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    3.52 +	  rm -f Makefile ; mv Mk.tmp Makefile )
    3.53 +	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig
    3.54  
    3.55  prep: $(LINUX_DIR)/include/linux/autoconf.h
    3.56