ia64/xen-unstable

changeset 5105:92afc5dda6d8

bitkeeper revision 1.1159.258.153 (42926ca7c8Vr3ajMe46BA7Li6zagcw)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk
author cl349@firebug.cl.cam.ac.uk
date Mon May 23 23:52:07 2005 +0000 (2005-05-23)
parents 50a2c86612b9 b6c2b1279260
children 4ac062bc252d
files buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU
line diff
     1.1 --- a/buildconfigs/mk.linux-2.4-xen0	Sun May 22 10:30:17 2005 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Mon May 23 23:52:07 2005 +0000
     1.3 @@ -30,18 +30,18 @@ patches/tmp/ebtables.diff:
     1.4  	# Apply arch-xen patches
     1.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     1.6            ./mkbuildtree ../$(LINUX_DIR) )
     1.7 +	# add ebtables patch
     1.8 +	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
     1.9 +	# Re-use config from install dir if one exits else use default config
    1.10 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    1.11 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    1.12 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    1.13 +	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    1.14 +		$(LINUX_DIR)/.config
    1.15  	# Patch kernel Makefile to set EXTRAVERSION
    1.16  	( cd $(LINUX_DIR) ; \
    1.17  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    1.18  	  rm -f Makefile ; mv Mk.tmp Makefile )
    1.19 -	# add ebtables patch
    1.20 -	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
    1.21 -	# Re-use config from install dir if one exits else use default config
    1.22 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    1.23 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    1.24 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    1.25 -	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    1.26 -		$(LINUX_DIR)/.config
    1.27  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    1.28  	make -C $(LINUX_DIR) ARCH=xen dep
    1.29  
     2.1 --- a/buildconfigs/mk.linux-2.4-xenU	Sun May 22 10:30:17 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Mon May 23 23:52:07 2005 +0000
     2.3 @@ -25,16 +25,16 @@ build: $(LINUX_DIR)/include/linux/autoco
     2.4  	# Apply arch-xen patches
     2.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     2.6            ./mkbuildtree ../$(LINUX_DIR) )
     2.7 +	# Re-use config from install dir if one exits else use default config
     2.8 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     2.9 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    2.10 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    2.11 +	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    2.12 +		$(LINUX_DIR)/.config
    2.13  	# Patch kernel Makefile to set EXTRAVERSION
    2.14  	( cd $(LINUX_DIR) ; \
    2.15  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    2.16  	  rm -f Makefile ; mv Mk.tmp Makefile )
    2.17 -	# Re-use config from install dir if one exits else use default config
    2.18 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    2.19 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    2.20 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    2.21 -	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    2.22 -		$(LINUX_DIR)/.config
    2.23  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    2.24  	make -C $(LINUX_DIR) ARCH=xen dep
    2.25  
     3.1 --- a/buildconfigs/mk.linux-2.6-xen0	Sun May 22 10:30:17 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Mon May 23 23:52:07 2005 +0000
     3.3 @@ -25,16 +25,16 @@ build: $(LINUX_DIR)/include/linux/autoco
     3.4  	# Apply arch-xen patches
     3.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     3.6            ./mkbuildtree ../$(LINUX_DIR) )
     3.7 +	# Re-use config from install dir if one exits else use default config
     3.8 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     3.9 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    3.10 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    3.11 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    3.12 +		$(LINUX_DIR)/.config
    3.13  	# Patch kernel Makefile to set EXTRAVERSION
    3.14  	( cd $(LINUX_DIR) ; \
    3.15  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    3.16  	  rm -f Makefile ; mv Mk.tmp Makefile )
    3.17 -	# Re-use config from install dir if one exits else use default config
    3.18 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    3.19 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    3.20 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    3.21 -	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    3.22 -		$(LINUX_DIR)/.config
    3.23  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    3.24  
    3.25  clean::
     4.1 --- a/buildconfigs/mk.linux-2.6-xenU	Sun May 22 10:30:17 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Mon May 23 23:52:07 2005 +0000
     4.3 @@ -25,16 +25,16 @@ build: $(LINUX_DIR)/include/linux/autoco
     4.4  	# Apply arch-xen patches
     4.5  	( cd linux-$(LINUX_VER)-xen-sparse ; \
     4.6            ./mkbuildtree ../$(LINUX_DIR) )
     4.7 +	# Re-use config from install dir if one exits else use default config
     4.8 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
     4.9 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
    4.10 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
    4.11 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    4.12 +		$(LINUX_DIR)/.config
    4.13  	# Patch kernel Makefile to set EXTRAVERSION
    4.14  	( cd $(LINUX_DIR) ; \
    4.15  	  sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
    4.16  	  rm -f Makefile ; mv Mk.tmp Makefile )
    4.17 -	# Re-use config from install dir if one exits else use default config
    4.18 -	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    4.19 -	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    4.20 -	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    4.21 -	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    4.22 -		$(LINUX_DIR)/.config
    4.23  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
    4.24  
    4.25  clean::