bitkeeper revision 1.1159.1.346 (4188d882FwpqRabp9rhXLwbR2fAQjQ)

build system cleanups

6 files changed, 71 insertions, 11 deletions

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 6f1caf7d67..e80597bf9b 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -1,4 +1,11 @@
 
+# We expect these two to already be set if people 
+# are using the top-level Makefile
+DIST_DIR    ?= $(shell pwd)/dist
+INSTALL_DIR ?= $(DIST_DIR)/install
+
+
+# Figure out which Linux version
 LINUX_26VER ?= $(shell ( /bin/ls -ld linux-2.6.*-xen-sparse ) \
 		2>/dev/null | sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
 
@@ -24,7 +31,7 @@ LINUX_26SRC := ./linux-$(LINUX_26VER).tar.bz2
 endif
 
 pristine-linux-$(LINUX_26VER): $(LINUX_26SRC)
-	rm -rf tmp $@ && mkdir -p tmp && tar -C tmp -jxf $(LINUX_26SRC) && mv tmp/* $@
+	rm -rf tmp-linux-$(LINUX_26VER) $@ && mkdir -p tmp-linux-$(LINUX_26VER) && tar -C tmp-linux-$(LINUX_26VER) -jxf $(LINUX_26SRC) && mv tmp-linux-$(LINUX_26VER)/* $@
 	touch $@ # update timestamp to avoid rebuild
 
 
@@ -37,7 +44,7 @@ LINUX_24SRC := ./linux-$(LINUX_24VER).tar.bz2
 endif
 
 pristine-linux-$(LINUX_24VER): $(LINUX_24SRC)
-	rm -rf tmp $@ && mkdir -p tmp && tar -C tmp -jxf $(LINUX_24SRC) && mv tmp/* $@
+	rm -rf tmp-linux-$(LINUX_24VER) $@ && mkdir -p tmp-linux-$(LINUX_24VER) && tar -C tmp-linux-$(LINUX_24VER) -jxf $(LINUX_24SRC) && mv tmp-linux-$(LINUX_24VER)/* $@
 	touch $@ # update timestamp to avoid rebuild
 
 linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER)	
@@ -61,4 +68,5 @@ mkpatches: linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
 mrproper:
 	rm -rf pristine-linux-$(LINUX_24VER) linux-$(LINUX_24VER).tar.bz2
 	rm -rf pristine-linux-$(LINUX_26VER) linux-$(LINUX_26VER).tar.bz2
-	rm -rf linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
\ No newline at end of file
+	rm -rf linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
+	rm -rf pristine-netbsd-2.0
diff --git a/buildconfigs/linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index 7f13f52109..5c631b09f9 100644
--- a/buildconfigs/linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -42,8 +42,8 @@ build: $(LINUX_DIR)
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
-kdelete: 
-	rm -rf tmp $(LINUX_DIR) 
+delete: 
+	rm -rf tmp-linux-$(LINUX_24VER) $(LINUX_DIR) 
 
 
 
diff --git a/buildconfigs/linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index e849da907d..113ee0c9ea 100644
--- a/buildconfigs/linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -40,8 +40,8 @@ build: $(LINUX_DIR)
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
-kdelete: 
-	rm -rf tmp $(LINUX_DIR) 
+delete: 
+	rm -rf tmp-linux-$(LINUX_24VER) $(LINUX_DIR) 
 
 
 
diff --git a/buildconfigs/linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 32f9be17f7..4eadd852f4 100644
--- a/buildconfigs/linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -34,8 +34,8 @@ build: $(LINUX_DIR)
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
-kdelete: 
-	rm -rf tmp $(LINUX_DIR) 
+delete: 
+	rm -rf tmp-linux-$(LINUX_26VER) $(LINUX_DIR) 
 
 
 
diff --git a/buildconfigs/linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index eb25a7032c..38bf9b85f1 100644
--- a/buildconfigs/linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -34,8 +34,8 @@ build: $(LINUX_DIR)
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
-kdelete: 
-	rm -rf tmp $(LINUX_DIR) 
+delete: 
+	rm -rf tmp-linux-$(LINUX_26VER) $(LINUX_DIR) 
 
 
 
diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU
new file mode 100644
index 0000000000..d41bb39f57
--- /dev/null
+++ b/buildconfigs/mk.netbsd-2.0-xenU
@@ -0,0 +1,52 @@
+
+NETBSD_RELEASE   ?= 2.0
+NETBSD_VER       ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \
+		      sed -e 's!^.*netbsd-\(.\+\)-xen-sparse!\1!' )
+NETBSD_CVSSNAP   ?= 20040906
+NETBSD_SRC_PATH  ?= .:..
+NETBSD_SRC       ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
+                    $(wildcard $(dir)/netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.*z*)))
+NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
+                    $(wildcard $(dir)/netbsd-$(NETBSD_VER)-tools.tar.*z*)))
+
+NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU
+
+pristine-netbsd-src: 
+ifeq ($(NETBSD_SRC),)
+	@echo "Cannot find netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.gz in path $(NETBSD_SRC_PATH)"
+	@wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 -O./netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
+NETBSD_SRC := ./netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 
+endif
+
+pristine-netbsd-tools-src: 
+ifeq ($(NETBSD_TOOLS_SRC),)
+	@echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path $(NETBSD_SRC_PATH)"
+	@wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/netbsd-$(NETBSD_VER)-tools.tar.bz2 -O./netbsd-$(NETBSD_VER)-tools.tar.bz2
+NETBSD_TOOLS_SRC := ./netbsd-$(NETBSD_VER)-tools.tar.bz2 
+endif
+
+netbsd-tools: pristine-netbsd-tools-src
+	@[ -d netbsd-$(NETBSD_RELEASE)-tools ] || { \
+		echo extract $(NETBSD_TOOLS_SRC); \
+		tar -jxf $(NETBSD_TOOLS_SRC); }
+
+mk-netbsd-trees: netbsd-tools pristine-netbsd-src 
+	$(RM) -rf $(NETBSD_TREES)
+	echo $(NETBSD_SRC) | grep -q bz2 && \
+	    tar -jxf $(NETBSD_SRC) || tar -zxf $(NETBSD_SRC)
+	mv netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP) \
+	    netbsd-$(NETBSD_VER)-xenU
+	( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
+          ./mkbuildtree ../netbsd-$(NETBSD_VER)-xenU )
+
+# build the specified netbsd tree
+NBDIR = $(subst netbsd-,netbsd-$(NETBSD_VER)-,$@)
+netbsd-xen%:	
+	$(MAKE) -C $(NBDIR) config
+	$(MAKE) -C $(NBDIR) netbsd
+	$(MAKE) -C $(NBDIR) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
+
+build: $(NETBSD_TREES)
+
+delete:
+	rm -rf $(NETBSD_TREES)
\ No newline at end of file