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

[Xen-changelog] Many files:

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] Many files:
From: BitKeeper Bot <riel@xxxxxxxxxxx>
Date: Thu, 12 May 2005 13:05:04 +0000
Delivery-date: Thu, 12 May 2005 14:03:12 +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.1159.258.115, 2005/05/12 14:05:04+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Many files:
          Add additional intermediate tree (e.g. ref-linux-2.6.11) which is a 
pristine
          tree with the patches from patches/$(OS)-$(OS_VER) applied.  The 
pristine tree
          is really pristine now.  Also add dependency of ref-$(OS)-$(OS_VER) 
tree on
          patches in patches/$(OS)-$(OS_VER).
        ignore:
          Add ref-*
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 Rules.mk           |   20 +++++++++++++++++---
 mk.linux-2.4-xen0  |    8 +++++---
 mk.linux-2.4-xenU  |    8 +++++---
 mk.linux-2.6-xen0  |    8 +++++---
 mk.linux-2.6-xenU  |    8 +++++---
 mk.netbsd-2.0-xenU |   10 ++++++----
 6 files changed, 43 insertions(+), 19 deletions(-)


diff -Nru a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     2005-05-12 10:03:46 -04:00
+++ b/buildconfigs/Rules.mk     2005-05-12 10:03:46 -04:00
@@ -41,6 +41,12 @@
 netbsd-%.tar.bz2: netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
        ln -fs $< $@
 
+ifeq ($(OS),linux)
+OS_VER = $(LINUX_VER)
+else
+OS_VER = $(NETBSD_VER)
+endif
+
 pristine-%: %.tar.bz2
        rm -rf tmp-$(@F) $@
        mkdir -p tmp-$(@F)
@@ -48,9 +54,17 @@
        mv tmp-$(@F)/* $@
        touch $@ # update timestamp to avoid rebuild
        @rm -rf tmp-$(@F)
+
+OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch)
+
+ref-%: pristine-% $(OS_PATCHES)
+       rm -rf $@
+       cp -al $< tmp-$(@F)
        [ -d patches/$* ] && \
-         for i in patches/$*/*.patch ; do ( cd $@ ; patch -p1 <../$$i ) ; done 
|| \
+         for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) 
; done || \
          true
+       mv tmp-$(@F) $@
+       touch $@ # update timestamp to avoid rebuild
 
 %-build:
        $(MAKE) -f buildconfigs/mk.$* build
@@ -61,7 +75,7 @@
 %-clean:
        $(MAKE) -f buildconfigs/mk.$* clean
 
-%-xen.patch: pristine-%
+%-xen.patch: ref-%
        rm -rf tmp-$@
        cp -al $< tmp-$@
        ( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ ) 
@@ -69,7 +83,7 @@
        rm -rf tmp-$@
 
 %-mrproper: %-mrproper-extra
-       rm -rf pristine-$* $*.tar.bz2
+       rm -rf pristine-$* ref-$* $*.tar.bz2
        rm -rf $*-xen.patch
 
 netbsd-%-mrproper-extra:
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 10:03:46 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0    2005-05-12 10:03:46 -04:00
@@ -1,11 +1,13 @@
 
+OS           = linux
+
 LINUX_SERIES = 2.4
 
 EXTRAVERSION = xen0
 
 FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
 
-LINUX_DIR    = linux-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(FULLVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -24,7 +26,7 @@
        wget 
http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz 
-O- | gunzip -c > $@
 
 $(LINUX_DIR)/include/linux/autoconf.h: patches/tmp/ebtables.diff
-$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al $< $(LINUX_DIR)
        # Apply arch-xen patches
@@ -48,4 +50,4 @@
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
 delete: 
-       rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
+       rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
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 10:03:46 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU    2005-05-12 10:03:46 -04:00
@@ -1,11 +1,13 @@
 
+OS           = linux
+
 LINUX_SERIES = 2.4
 
 EXTRAVERSION = xenU
 
 FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
 
-LINUX_DIR    = linux-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(FULLVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -19,7 +21,7 @@
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
-$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al $< $(LINUX_DIR)
        # Apply arch-xen patches
@@ -41,4 +43,4 @@
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
 delete: 
-       rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
+       rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
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 10:03:47 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0    2005-05-12 10:03:47 -04:00
@@ -1,11 +1,13 @@
 
+OS           = linux
+
 LINUX_SERIES = 2.6
 
 EXTRAVERSION = xen0
 
 FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
 
-LINUX_DIR    = linux-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(FULLVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -19,7 +21,7 @@
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
-$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al $< $(LINUX_DIR)
        # Apply arch-xen patches
@@ -40,4 +42,4 @@
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
 delete: 
-       rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
+       rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
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 10:03:46 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU    2005-05-12 10:03:46 -04:00
@@ -1,11 +1,13 @@
 
+OS           = linux
+
 LINUX_SERIES = 2.6
 
 EXTRAVERSION = xenU
 
 FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
 
-LINUX_DIR    = linux-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(FULLVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -19,7 +21,7 @@
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
-$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al $< $(LINUX_DIR)
        # Apply arch-xen patches
@@ -40,4 +42,4 @@
        $(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
 delete: 
-       rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 
+       rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
diff -Nru a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU
--- a/buildconfigs/mk.netbsd-2.0-xenU   2005-05-12 10:03:46 -04:00
+++ b/buildconfigs/mk.netbsd-2.0-xenU   2005-05-12 10:03:46 -04:00
@@ -1,4 +1,6 @@
 
+OS                = netbsd
+
 NETBSD_RELEASE   ?= 2.0
 NETBSD_CVSSNAP   ?= 20050309
 
@@ -6,13 +8,13 @@
 
 FULLVERSION  = $(NETBSD_VER)-$(EXTRAVERSION)
 
-NETBSD_DIR   = netbsd-$(FULLVERSION)
+NETBSD_DIR   = $(OS)-$(FULLVERSION)
 
 .PHONY: build clean mrproper mkpatch
 
 include buildconfigs/Rules.mk
 
-build: netbsd-$(EXTRAVERSION)
+build: $(OS)-$(EXTRAVERSION)
 
 netbsd-%-tools.tar.bz2:
        @echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path 
$(NETBSD_SRC_PATH)"
@@ -22,7 +24,7 @@
        tar -jxf $<
        touch $@ # update timestamp to avoid rebuild
 
-$(NETBSD_DIR)/.valid: pristine-netbsd-$(NETBSD_VER)
+$(NETBSD_DIR)/.valid: ref-$(OS)-$(NETBSD_VER)
        $(RM) -rf $(NETBSD_DIR)
        cp -al $< $(NETBSD_DIR)
        # Apply arch-xen patches
@@ -40,4 +42,4 @@
        $(MAKE) -C netbsd-$(FULLVERSION) clean
 
 delete:
-       rm -rf tmp-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
+       rm -rf tmp-$(OS)-$(NETBSD_VER) $(NETBSD_DIR)

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

<Prev in Thread] Current Thread [Next in Thread>