[Xen-changelog] [xen-unstable] [BUILD] Fix re-use of existing config files in dist/install/boot.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 30cdeb686b93e566ecdeab80e9e342d4dfd776f9
# Parent  8e55c5c1147589b7a6a1875384d4317aec7ccf84
[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@xxxxxxxxxxxxx>
---
 buildconfigs/Rules.mk         |   14 ++++++++------
 buildconfigs/mk.linux-2.6-xen |    6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff -r 8e55c5c11475 -r 30cdeb686b93 buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     Wed Jul 05 18:48:41 2006 +0100
+++ b/buildconfigs/Rules.mk     Sat Jul 08 19:22:34 2006 +0100
@@ -69,9 +69,6 @@ ref-%/.valid-ref: pristine-%/.valid-pris
        touch $@ # update timestamp to avoid rebuild
 endif
 
-%-prep:
-       $(MAKE) -f buildconfigs/mk.$* prep
-
 %-install:
        $(MAKE) -f buildconfigs/mk.$* build
 
@@ -83,14 +80,19 @@ 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-$@
diff -r 8e55c5c11475 -r 30cdeb686b93 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen     Wed Jul 05 18:48:41 2006 +0100
+++ b/buildconfigs/mk.linux-2.6-xen     Sat Jul 08 19:22:34 2006 +0100
@@ -4,6 +4,8 @@ EXTRAVERSION ?= xen
 EXTRAVERSION ?= xen
 
 LINUX_DIR    = linux-$(LINUX_VER)-$(EXTRAVERSION)
+
+LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))
 
 include buildconfigs/Rules.mk
 
@@ -25,8 +27,8 @@ build: $(LINUX_DIR)/include/linux/autoco
           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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog