diff options
| author | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-04 20:36:22 +0000 |
|---|---|---|
| committer | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-04 20:36:22 +0000 |
| commit | 6325df3f26a52eaf193982cd484559010b9d4670 (patch) | |
| tree | 89f1db3fecc7e00c8f38b1811964d1cf6952451d /buildconfigs | |
| parent | 218c046b48ac436d96adadd5a85a5a6bc782ea81 (diff) | |
| download | xen-6325df3f26a52eaf193982cd484559010b9d4670.tar.gz xen-6325df3f26a52eaf193982cd484559010b9d4670.tar.bz2 xen-6325df3f26a52eaf193982cd484559010b9d4670.zip | |
bitkeeper revision 1.1159.1.375 (418a92c65GAOZnDDyo9gXyKiJkLKxQ)
Avoid error message when trying to copy config file from install dir.
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/mk.linux-2.4-xen0 | 7 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.4-xenU | 7 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 7 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0 index c83291324e..aded0d43b2 100644 --- a/buildconfigs/mk.linux-2.4-xen0 +++ b/buildconfigs/mk.linux-2.4-xen0 @@ -33,8 +33,11 @@ $(LINUX_DIR): pristine-linux-$(LINUX_VER) patches/ebtables.diff rm -f Makefile ; mv Mk.tmp Makefile ) # add ebtables patch ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/ebtables.diff ) - # Re-use config from install dir if one exits else use make defconfig - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config + # Re-use config from install dir if one exits else use default config + [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ + cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \ + $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig make -C $(LINUX_DIR) ARCH=xen dep diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU index c1afc93708..9469644531 100644 --- a/buildconfigs/mk.linux-2.4-xenU +++ b/buildconfigs/mk.linux-2.4-xenU @@ -31,8 +31,11 @@ $(LINUX_DIR): pristine-linux-$(LINUX_VER) patches/ebtables.diff ( cd $(LINUX_DIR) ; \ sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) - # Re-use config from install dir if one exits else use make defconfig - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config + # Re-use config from install dir if one exits else use default config + [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ + cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \ + $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig make -C $(LINUX_DIR) ARCH=xen dep diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index 67a5c7b3a8..a2a8551ad7 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -27,8 +27,11 @@ $(LINUX_DIR): pristine-linux-$(LINUX_VER) ( cd $(LINUX_DIR) ; \ sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) - # Re-use config from install dir if one exits else use make defconfig - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config + # Re-use config from install dir if one exits else use default config + [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ + cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ + $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig clean: diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index 6782cf07b7..70841551b5 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -28,8 +28,11 @@ $(LINUX_DIR): pristine-linux-$(LINUX_VER) ( cd $(LINUX_DIR) ; \ sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) - # Re-use config from install dir if one exits else use make defconfig - cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config + # Re-use config from install dir if one exits else use default config + [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \ + cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ + $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig clean: |