[Xen-changelog] mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1851, 2005/05/12 16:41:03+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        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@xxxxxxxxxxxx>



 mk.linux-2.4-xen0 |    9 ++++-----
 mk.linux-2.4-xenU |    9 ++++-----
 mk.linux-2.6-xen0 |    9 ++++-----
 mk.linux-2.6-xenU |    9 ++++-----
 4 files changed, 16 insertions(+), 20 deletions(-)


diff -Nru a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
--- a/buildconfigs/mk.linux-2.4-xen0    2005-05-12 12:07:30 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0    2005-05-12 12:07:30 -04:00
@@ -5,9 +5,7 @@
 
 EXTRAVERSION = xen0
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -39,8 +37,9 @@
        # add ebtables patch
        ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
        # 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/defconfig-$(EXTRAVERSION) \
                $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Nru a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
--- a/buildconfigs/mk.linux-2.4-xenU    2005-05-12 12:07:30 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU    2005-05-12 12:07:30 -04:00
@@ -5,9 +5,7 @@
 
 EXTRAVERSION = xenU
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -32,8 +30,9 @@
          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/defconfig-$(EXTRAVERSION) \
                $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig
diff -Nru a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0    2005-05-12 12:07:30 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0    2005-05-12 12:07:30 -04:00
@@ -5,9 +5,7 @@
 
 EXTRAVERSION = xen0
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -32,8 +30,9 @@
          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
diff -Nru a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU    2005-05-12 12:07:30 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU    2005-05-12 12:07:30 -04:00
@@ -5,9 +5,7 @@
 
 EXTRAVERSION = xenU
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -32,8 +30,9 @@
          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

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