bitkeeper revision 1.1159.258.115 (428354804NJckGgn06IblzmoXJ6F4A)

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@cl.cam.ac.uk>

6 files changed, 43 insertions, 19 deletions

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index b0b0c4697f..60b4fea1db 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -41,6 +41,12 @@ netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
 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 @@ pristine-%: %.tar.bz2
 	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 @@ pristine-%: %.tar.bz2
 %-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 @@ pristine-%: %.tar.bz2
 	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 --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index be21fc5ec3..482bbb359c 100644
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -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 @@ patches/tmp/ebtables.diff:
 	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 @@ clean:
 	$(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 --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index 26563c11e6..4053fde7d7 100644
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -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 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
 	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 @@ clean:
 	$(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 --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 5685eb3e12..5eaa81ecc4 100644
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -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 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
 	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 @@ clean:
 	$(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 --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 1e5bbd4f37..b7dd424184 100644
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -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 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
 	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 @@ clean:
 	$(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 --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU
index 2e272aa6b3..bbe2e1fea9 100644
--- a/buildconfigs/mk.netbsd-2.0-xenU
+++ b/buildconfigs/mk.netbsd-2.0-xenU
@@ -1,4 +1,6 @@
 
+OS                = netbsd
+
 NETBSD_RELEASE   ?= 2.0
 NETBSD_CVSSNAP   ?= 20050309
 
@@ -6,13 +8,13 @@ EXTRAVERSION = xenU
 
 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 @@ netbsd-%-tools: netbsd-%-tools.tar.bz2
 	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 @@ clean:
 	$(MAKE) -C netbsd-$(FULLVERSION) clean
 
 delete:
-	rm -rf tmp-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
+	rm -rf tmp-$(OS)-$(NETBSD_VER) $(NETBSD_DIR)