diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-12 15:41:03 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-12 15:41:03 +0000 |
| commit | 7a61c7cf0c8d03fa9ef756c5c7f47303aa4c347f (patch) | |
| tree | cab9ee4949cac7b9f0b2f3e2ff8ee03680dd75d3 /buildconfigs/mk.linux-2.6-xen0 | |
| parent | 51e483445c1c96d33ba9f7e6182596a296277821 (diff) | |
| download | xen-7a61c7cf0c8d03fa9ef756c5c7f47303aa4c347f.tar.gz xen-7a61c7cf0c8d03fa9ef756c5c7f47303aa4c347f.tar.bz2 xen-7a61c7cf0c8d03fa9ef756c5c7f47303aa4c347f.zip | |
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>
Diffstat (limited to 'buildconfigs/mk.linux-2.6-xen0')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index 5eaa81ecc4..f55cf1a995 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.6 EXTRAVERSION = xen0 -FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION) - -LINUX_DIR = $(OS)-$(FULLVERSION) +LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) include buildconfigs/Rules.mk @@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER) 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 default config - [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ - cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.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 \ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig |