From 6325df3f26a52eaf193982cd484559010b9d4670 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Thu, 4 Nov 2004 20:36:22 +0000 Subject: bitkeeper revision 1.1159.1.375 (418a92c65GAOZnDDyo9gXyKiJkLKxQ) Avoid error message when trying to copy config file from install dir. --- buildconfigs/mk.linux-2.6-xenU | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'buildconfigs/mk.linux-2.6-xenU') 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: -- cgit v1.2.3