ia64/xen-unstable

changeset 4884:0dfd63fbc01c

bitkeeper revision 1.1159.258.117 (4283790fhpDiiKA-POixMtbhwAG92Q)

mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0:
Honour EXTRAVERSION when trying to re-use a config file from a previous build.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu May 12 15:41:03 2005 +0000 (2005-05-12)
parents caa382d9c347
children 6b2617509ad1 4a1ee13af3c2 dade12e98fcc
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	Thu May 12 13:28:16 2005 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Thu May 12 15:41:03 2005 +0000
     1.3 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
     1.4  
     1.5  EXTRAVERSION = xen0
     1.6  
     1.7 -FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
     1.8 -
     1.9 -LINUX_DIR    = $(OS)-$(FULLVERSION)
    1.10 +LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
    1.11  
    1.12  include buildconfigs/Rules.mk
    1.13  
    1.14 @@ -39,8 +37,9 @@ patches/tmp/ebtables.diff:
    1.15  	# add ebtables patch
    1.16  	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
    1.17  	# Re-use config from install dir if one exits else use default config
    1.18 -	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    1.19 -	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    1.20 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    1.21 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    1.22 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    1.23  	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    1.24  		$(LINUX_DIR)/.config
    1.25  	make -C $(LINUX_DIR) ARCH=xen oldconfig
     2.1 --- a/buildconfigs/mk.linux-2.4-xenU	Thu May 12 13:28:16 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Thu May 12 15:41:03 2005 +0000
     2.3 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
     2.4  
     2.5  EXTRAVERSION = xenU
     2.6  
     2.7 -FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
     2.8 -
     2.9 -LINUX_DIR    = $(OS)-$(FULLVERSION)
    2.10 +LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
    2.11  
    2.12  include buildconfigs/Rules.mk
    2.13  
    2.14 @@ -32,8 +30,9 @@ build: $(LINUX_DIR)/include/linux/autoco
    2.15  	  sed -e 's/^EXTRAVERSION.*/&-$(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 -	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    2.19 -	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    2.20 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    2.21 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    2.22 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    2.23  	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    2.24  		$(LINUX_DIR)/.config
    2.25  	make -C $(LINUX_DIR) ARCH=xen oldconfig
     3.1 --- a/buildconfigs/mk.linux-2.6-xen0	Thu May 12 13:28:16 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Thu May 12 15:41:03 2005 +0000
     3.3 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
     3.4  
     3.5  EXTRAVERSION = xen0
     3.6  
     3.7 -FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
     3.8 -
     3.9 -LINUX_DIR    = $(OS)-$(FULLVERSION)
    3.10 +LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
    3.11  
    3.12  include buildconfigs/Rules.mk
    3.13  
    3.14 @@ -32,8 +30,9 @@ build: $(LINUX_DIR)/include/linux/autoco
    3.15  	  sed -e 's/^EXTRAVERSION.*/&-$(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 -	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    3.19 -	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    3.20 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    3.21 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    3.22 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    3.23  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    3.24  		$(LINUX_DIR)/.config
    3.25  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
     4.1 --- a/buildconfigs/mk.linux-2.6-xenU	Thu May 12 13:28:16 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Thu May 12 15:41:03 2005 +0000
     4.3 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
     4.4  
     4.5  EXTRAVERSION = xenU
     4.6  
     4.7 -FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
     4.8 -
     4.9 -LINUX_DIR    = $(OS)-$(FULLVERSION)
    4.10 +LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
    4.11  
    4.12  include buildconfigs/Rules.mk
    4.13  
    4.14 @@ -32,8 +30,9 @@ build: $(LINUX_DIR)/include/linux/autoco
    4.15  	  sed -e 's/^EXTRAVERSION.*/&-$(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 -	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
    4.19 -	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    4.20 +	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
    4.21 +	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
    4.22 +	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
    4.23  	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    4.24  		$(LINUX_DIR)/.config
    4.25  	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig