diff options
| author | chris@kneesaa.uk.xensource.com <chris@kneesaa.uk.xensource.com> | 2006-07-08 19:22:34 +0100 |
|---|---|---|
| committer | chris@kneesaa.uk.xensource.com <chris@kneesaa.uk.xensource.com> | 2006-07-08 19:22:34 +0100 |
| commit | 3d1d4c35fab8a2f2f90c8147cb72c4aee101f54c (patch) | |
| tree | 50cb62939e59751cd86860466876560854eaac25 /buildconfigs/mk.linux-2.6-xen | |
| parent | c0142256845e6fac89ee46f00a06b3ac6144340c (diff) | |
| download | xen-3d1d4c35fab8a2f2f90c8147cb72c4aee101f54c.tar.gz xen-3d1d4c35fab8a2f2f90c8147cb72c4aee101f54c.tar.bz2 xen-3d1d4c35fab8a2f2f90c8147cb72c4aee101f54c.zip | |
[BUILD] Fix re-use of existing config files in dist/install/boot.
- the name of the config file was computed incorrectly because of the
linux version number 4th digit being present in both LINUX_VER and
EXTRAVERSION extracted from the linux Makefile.
- DESTDIR was not set for the prep and config targets.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
Diffstat (limited to 'buildconfigs/mk.linux-2.6-xen')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index ce861acc1b..5de144259f 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -5,6 +5,8 @@ EXTRAVERSION ?= xen LINUX_DIR = linux-$(LINUX_VER)-$(EXTRAVERSION) +LINUX_VER3 := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER))) + include buildconfigs/Rules.mk # The real action starts here! @@ -25,8 +27,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref LINUX_ARCH=$(LINUX_ARCH) bash ./mkbuildtree ../$(LINUX_DIR) ) # 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-$(EXTRAVERSION) ] && \ - cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \ + [ -r $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \ + cp $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \ || cp buildconfigs/linux-defconfig_$(EXTRAVERSION)_$(XEN_TARGET_ARCH)$(XEN_SYSTYPE) \ $(LINUX_DIR)/.config # See if we need to munge config to enable PAE |