WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

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

from [BitKeeper Bot] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0:
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Mon, 23 May 2005 23:52:02 +0000
Delivery-date: Tue, 24 May 2005 00:04:02 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
ChangeSet 1.1885.1.1, 2005/05/24 00:52:02+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, 
mk.linux-2.4-xen0:
          Fix magic to find an old config file in dist/install/boot.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 mk.linux-2.4-xen0 |   12 ++++++------
 mk.linux-2.4-xenU |   12 ++++++------
 mk.linux-2.6-xen0 |   12 ++++++------
 mk.linux-2.6-xenU |   12 ++++++------
 4 files changed, 24 insertions(+), 24 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-23 20:04:46 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0    2005-05-23 20:04:46 -04:00
@@ -30,18 +30,18 @@
        # Apply arch-xen patches
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
           ./mkbuildtree ../$(LINUX_DIR) )
-       # Patch kernel Makefile to set EXTRAVERSION
-       ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
-         rm -f Makefile ; mv Mk.tmp Makefile )
        # 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
        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 \
+       [ -r 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+         cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
                $(LINUX_DIR)/.config
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
 
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-23 20:04:46 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU    2005-05-23 20:04:46 -04:00
@@ -25,16 +25,16 @@
        # Apply arch-xen patches
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
           ./mkbuildtree ../$(LINUX_DIR) )
-       # Patch kernel Makefile to set EXTRAVERSION
-       ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
-         rm -f Makefile ; mv Mk.tmp Makefile )
        # 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 ] && \
-         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION 
$(LINUX_DIR)/.config \
+       [ -r 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+         cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
                $(LINUX_DIR)/.config
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
 
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-23 20:04:46 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0    2005-05-23 20:04:46 -04:00
@@ -25,16 +25,16 @@
        # Apply arch-xen patches
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
           ./mkbuildtree ../$(LINUX_DIR) )
-       # Patch kernel Makefile to set EXTRAVERSION
-       ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
-         rm -f Makefile ; mv Mk.tmp Makefile )
        # 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 ] && \
-         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION 
$(LINUX_DIR)/.config \
+       [ -r 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+         cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
                $(LINUX_DIR)/.config
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
 
 clean::
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-23 20:04:46 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU    2005-05-23 20:04:46 -04:00
@@ -25,16 +25,16 @@
        # Apply arch-xen patches
        ( cd linux-$(LINUX_VER)-xen-sparse ; \
           ./mkbuildtree ../$(LINUX_DIR) )
-       # Patch kernel Makefile to set EXTRAVERSION
-       ( cd $(LINUX_DIR) ; \
-         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
-         rm -f Makefile ; mv Mk.tmp Makefile )
        # 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 ] && \
-         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION 
$(LINUX_DIR)/.config \
+       [ -r 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+         cp 
$(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) 
$(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
                $(LINUX_DIR)/.config
+       # Patch kernel Makefile to set EXTRAVERSION
+       ( cd $(LINUX_DIR) ; \
+         sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = 
-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+         rm -f Makefile ; mv Mk.tmp Makefile )
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
 
 clean::

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk, BitKeeper Bot
Next by Date:  [Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk, BitKeeper Bot
Previous by Thread:  [Xen-changelog] mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0:, BitKeeper Bot
Next by Thread:  [Xen-changelog] Add 'apic={verbose, debug}' option to Xen. Same meaning as on Linux, BitKeeper Bot
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy