diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-12 15:41:35 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-12 15:41:35 +0000 |
| commit | 4d384e881984d0c8bee85c1d9be57bd78ae328c3 (patch) | |
| tree | 233274287398042a06c6fec647fb41bd2befa308 /buildconfigs/mk.linux-2.6-xenU | |
| parent | 14075b5708e7c1c322fdddcc23d37c7b8449c80b (diff) | |
| parent | 7a61c7cf0c8d03fa9ef756c5c7f47303aa4c347f (diff) | |
| download | xen-4d384e881984d0c8bee85c1d9be57bd78ae328c3.tar.gz xen-4d384e881984d0c8bee85c1d9be57bd78ae328c3.tar.bz2 xen-4d384e881984d0c8bee85c1d9be57bd78ae328c3.zip | |
bitkeeper revision 1.1389.21.1 (4283792ffw1RN7kz5eMAmtk7CtBWnQ)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
Diffstat (limited to 'buildconfigs/mk.linux-2.6-xenU')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index 84375b6d96..f2df01f9a7 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -5,9 +5,7 @@ LINUX_SERIES = 2.6 EXTRAVERSION = xenU -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_$(TARGET_SUBARCH) \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig |