mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
[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>
This commit is contained in:
chris@kneesaa.uk.xensource.com committed
1 parent
c014225684
commit
3d1d4c35fa
2 files changed
+12
-8
No files matched your search
@@ -69,9 +69,6 @@ ref-%/.valid-ref: pristine-%/.valid-pristine
|
||||
touch $@ # update timestamp to avoid rebuild
|
||||
endif
|
||||
|
||||
%-prep:
|
||||
$(MAKE) -f buildconfigs/mk.$* prep
|
||||
|
||||
%-install:
|
||||
$(MAKE) -f buildconfigs/mk.$* build
|
||||
|
||||
@@ -83,15 +80,20 @@ endif
|
||||
%-build: %-dist
|
||||
@: # do nothing
|
||||
|
||||
%-prep: DESTDIR=$(DISTDIR)/install
|
||||
%-prep:
|
||||
$(MAKE) -f buildconfigs/mk.$* prep
|
||||
|
||||
%-config: DESTDIR=$(DISTDIR)/install
|
||||
%-config:
|
||||
$(MAKE) -f buildconfigs/mk.$* config
|
||||
|
||||
%-delete:
|
||||
$(MAKE) -f buildconfigs/mk.$* delete
|
||||
|
||||
%-clean:
|
||||
$(MAKE) -f buildconfigs/mk.$* clean
|
||||
|
||||
%-config:
|
||||
$(MAKE) -f buildconfigs/mk.$* config
|
||||
|
||||
linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref
|
||||
rm -rf tmp-$@
|
||||
cp -al $(<D) tmp-$@
|
||||
|
||||
@@ -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
|
||||
|
||||