From c3c5b4af97e835445eb33bd1957f88bfd693a414 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 23 May 2005 23:52:02 +0000 Subject: bitkeeper revision 1.1159.286.1 (42926ca2mQzPTNdXEXvnRmsyYb7PPg) mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0: Fix magic to find an old config file in dist/install/boot. Signed-off-by: Christian Limpach --- buildconfigs/mk.linux-2.6-xenU | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 7a3951cd92..dd979745c0 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -25,16 +25,16 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref # Apply arch-xen patches ( cd linux-$(LINUX_VER)-xen-sparse ; \ ./mkbuildtree ../$(LINUX_DIR) ) - # Patch kernel Makefile to set EXTRAVERSION - ( cd $(LINUX_DIR) ; \ - sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ - [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ - cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ + [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \ + cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ $(LINUX_DIR)/.config + # Patch kernel Makefile to set EXTRAVERSION + ( cd $(LINUX_DIR) ; \ + sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ + rm -f Makefile ; mv Mk.tmp Makefile ) $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig clean:: -- cgit v1.2.3