bitkeeper revision 1.1389.1.42 (42835536rA-h77TrcPbgY_ReOoY4bQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

7 files changed, 45 insertions, 20 deletions

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 3f65adddad..723303c1ba 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -62,6 +62,7 @@ patches/ebtables-brnf-5_vs_2.4.25.diff
 patches/ebtables.diff
 patches/tmp/*
 pristine-*
+ref-*
 tools/*/build/lib*/*.py
 tools/Makefile.smh
 tools/balloon/balloon
@@ -89,8 +90,8 @@ tools/blktap/xen/*
 tools/check/.*
 tools/cmdline/*
 tools/cmdline/xen/*
-tools/gdb/gdb-6.2.1/*
 tools/gdb/gdb-6.2.1-linux-i386-xen/*
+tools/gdb/gdb-6.2.1/*
 tools/ioemu/iodev/device-model
 tools/libxc/xen/*
 tools/misc/cpuperf/cpuperf-perfcntr
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 58109fd619..11f4009525 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -43,6 +43,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)
@@ -51,9 +57,17 @@ pristine-%: %.tar.bz2
 	touch $@ # update timestamp to avoid rebuild
 	touch $@/.bk_skip
 	@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
@@ -67,7 +81,7 @@ pristine-%: %.tar.bz2
 %-config:
 	$(MAKE) -f buildconfigs/mk.$* config
 
-%-xen.patch: pristine-%
+%-xen.patch: ref-%
 	rm -rf tmp-$@
 	cp -al $< tmp-$@
 	( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )	
@@ -75,7 +89,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 130cffba14..f48c27aec5 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
@@ -53,4 +55,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 051f071cb0..e2fed22df3 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
@@ -46,4 +48,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 c6992c96f1..4307b1ce37 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
@@ -44,4 +46,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 9a600170f8..84375b6d96 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
@@ -44,4 +46,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)