ia64/xen-unstable

changeset 2892:bf724487f9e7

bitkeeper revision 1.1159.1.375 (418a92c65GAOZnDDyo9gXyKiJkLKxQ)

Avoid error message when trying to copy config file from install dir.
author cl349@freefall.cl.cam.ac.uk
date Thu Nov 04 20:36:22 2004 +0000 (2004-11-04)
parents 59c1b7c5785d
children 8abea9c9c5fa
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 Nov 04 19:35:04 2004 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Thu Nov 04 20:36:22 2004 +0000
     1.3 @@ -33,8 +33,11 @@ patches/ebtables.diff:
     1.4  	  rm -f Makefile ; mv Mk.tmp Makefile )
     1.5  	# add ebtables patch
     1.6  	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/ebtables.diff )
     1.7 -	# Re-use config from install dir if one exits else use make defconfig
     1.8 -	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config
     1.9 +	# Re-use config from install dir if one exits else use default config
    1.10 +	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
    1.11 +	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    1.12 +	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    1.13 +		$(LINUX_DIR)/.config
    1.14  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    1.15  	make -C $(LINUX_DIR) ARCH=xen dep
    1.16  
     2.1 --- a/buildconfigs/mk.linux-2.4-xenU	Thu Nov 04 19:35:04 2004 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Thu Nov 04 20:36:22 2004 +0000
     2.3 @@ -31,8 +31,11 @@ patches/ebtables.diff:
     2.4  	( cd $(LINUX_DIR) ; \
     2.5  	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     2.6  	  rm -f Makefile ; mv Mk.tmp Makefile )
     2.7 -	# Re-use config from install dir if one exits else use make defconfig
     2.8 -	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config
     2.9 +	# Re-use config from install dir if one exits else use default config
    2.10 +	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
    2.11 +	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    2.12 +	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
    2.13 +		$(LINUX_DIR)/.config
    2.14  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    2.15  	make -C $(LINUX_DIR) ARCH=xen dep
    2.16  
     3.1 --- a/buildconfigs/mk.linux-2.6-xen0	Thu Nov 04 19:35:04 2004 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Thu Nov 04 20:36:22 2004 +0000
     3.3 @@ -27,8 +27,11 @@ build: $(LINUX_DIR)
     3.4  	( cd $(LINUX_DIR) ; \
     3.5  	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     3.6  	  rm -f Makefile ; mv Mk.tmp Makefile )
     3.7 -	# Re-use config from install dir if one exits else use make defconfig
     3.8 -	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
     3.9 +	# Re-use config from install dir if one exits else use default config
    3.10 +	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
    3.11 +	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    3.12 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    3.13 +		$(LINUX_DIR)/.config
    3.14  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    3.15  
    3.16  clean:
     4.1 --- a/buildconfigs/mk.linux-2.6-xenU	Thu Nov 04 19:35:04 2004 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Thu Nov 04 20:36:22 2004 +0000
     4.3 @@ -28,8 +28,11 @@ build: $(LINUX_DIR)
     4.4  	( cd $(LINUX_DIR) ; \
     4.5  	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
     4.6  	  rm -f Makefile ; mv Mk.tmp Makefile )
     4.7 -	# Re-use config from install dir if one exits else use make defconfig
     4.8 -	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
     4.9 +	# Re-use config from install dir if one exits else use default config
    4.10 +	[ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
    4.11 +	  cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
    4.12 +	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
    4.13 +		$(LINUX_DIR)/.config
    4.14  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    4.15  
    4.16  clean: