bitkeeper revision 1.1159.1.348 (4188dd20H8_2AnNrTZaViP9haZ8hzw)

trivial make cleanup

6 files changed, 51 insertions, 47 deletions

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index e80597bf9b..8167d5f386 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -31,7 +31,7 @@ LINUX_26SRC := ./linux-$(LINUX_26VER).tar.bz2
 endif
 
 pristine-linux-$(LINUX_26VER): $(LINUX_26SRC)
-	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)/* $@
+	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)/* $@ ; rm -rf tmp-linux-$(LINUX_26VER)
 	touch $@ # update timestamp to avoid rebuild
 
 
@@ -44,7 +44,7 @@ LINUX_24SRC := ./linux-$(LINUX_24VER).tar.bz2
 endif
 
 pristine-linux-$(LINUX_24VER): $(LINUX_24SRC)
-	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)/* $@
+	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)/* $@ ; rm -rf tmp-linux-$(LINUX_24VER)
 	touch $@ # update timestamp to avoid rebuild
 
 linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER)	
diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index 5c631b09f9..713b746c03 100644
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -5,18 +5,20 @@ FULLVERSION  = $(LINUX_24VER)-$(EXTRAVERSION)
 
 LINUX_DIR    = linux-$(FULLVERSION)
 
-.PHONY: build clean mrproper mkpatch
-
 include buildconfigs/Rules.mk
 
-.PHONY: build clean mrproper mkpatch
+.PHONY: build clean delete
 
+# The real action starts here!
+build: $(LINUX_DIR)
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
 patches/ebtables.diff:
 	mkdir -p patches
 	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
 
-# The real action starts here!
 $(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
 	rm -rf $(LINUX_DIR)
 	cp -al pristine-linux-$(LINUX_24VER) $(LINUX_DIR)
@@ -34,11 +36,6 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
 	make -C $(LINUX_DIR) ARCH=xen oldconfig
 	make -C $(LINUX_DIR) ARCH=xen dep
 
-build: $(LINUX_DIR)
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
-
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index 113ee0c9ea..7099d12c20 100644
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -5,18 +5,20 @@ FULLVERSION  = $(LINUX_24VER)-$(EXTRAVERSION)
 
 LINUX_DIR    = linux-$(FULLVERSION)
 
-.PHONY: build clean mrproper mkpatch
-
 include buildconfigs/Rules.mk
 
-.PHONY: build clean mrproper mkpatch
+.PHONY: build clean delete
 
+# The real action starts here!
+build: $(LINUX_DIR)
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules	
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
 patches/ebtables.diff:
 	mkdir -p patches
 	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
 
-# The real action starts here!
 $(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
 	rm -rf $(LINUX_DIR)
 	cp -al pristine-linux-$(LINUX_24VER) $(LINUX_DIR)
@@ -32,11 +34,6 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
 	make -C $(LINUX_DIR) ARCH=xen oldconfig
 	make -C $(LINUX_DIR) ARCH=xen dep
 
-build: $(LINUX_DIR)
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules	
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
-
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 4eadd852f4..18e315ef71 100644
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -5,11 +5,14 @@ FULLVERSION  = $(LINUX_26VER)-$(EXTRAVERSION)
 
 LINUX_DIR    = linux-$(FULLVERSION)
 
-.PHONY: build clean mrproper mkpatch
-
 include buildconfigs/Rules.mk
 
-.PHONY: build clean mrproper mkpatch
+.PHONY: build clean delete
+
+build: $(LINUX_DIR)
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
 # The real action starts here!
 $(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
@@ -26,11 +29,6 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
 	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
 	make -C $(LINUX_DIR) ARCH=xen oldconfig
 
-build: $(LINUX_DIR)
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
-
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 38bf9b85f1..c52d76be26 100644
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -5,13 +5,17 @@ FULLVERSION  = $(LINUX_26VER)-$(EXTRAVERSION)
 
 LINUX_DIR    = linux-$(FULLVERSION)
 
-.PHONY: build clean mrproper mkpatch
-
 include buildconfigs/Rules.mk
 
-.PHONY: build clean mrproper mkpatch
+.PHONY: build clean delete
 
 # The real action starts here!
+build: $(LINUX_DIR)
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+
+
 $(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
 	rm -rf $(LINUX_DIR)
 	cp -al pristine-linux-$(LINUX_26VER) $(LINUX_DIR)
@@ -26,11 +30,6 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
 	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
 	make -C $(LINUX_DIR) ARCH=xen oldconfig
 
-build: $(LINUX_DIR)
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
-
 clean:
 	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
 
diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU
index d41bb39f57..f5f34c0eb1 100644
--- a/buildconfigs/mk.netbsd-2.0-xenU
+++ b/buildconfigs/mk.netbsd-2.0-xenU
@@ -1,5 +1,16 @@
 
 NETBSD_RELEASE   ?= 2.0
+
+EXTRAVERSION = xenU
+
+FULLVERSION  = $(NETBSD_VER)-$(EXTRAVERSION)
+
+NETBSD_DIR   = netbsd-$(FULLVERSION)
+
+.PHONY: build clean mrproper mkpatch
+
+include buildconfigs/Rules.mk
+
 NETBSD_VER       ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \
 		      sed -e 's!^.*netbsd-\(.\+\)-xen-sparse!\1!' )
 NETBSD_CVSSNAP   ?= 20040906
@@ -11,13 +22,19 @@ NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
 
 NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU
 
-pristine-netbsd-src: 
+build: $(NETBSD_DIR) netbsd-$(EXTRAVERSION)
+
+netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
 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-$(NETBSD_VER): $(NETBSD_SRC)
+	rm -rf tmp-netbsd-$(NETBSD_VER) $@ && mkdir -p tmp-netbsd-$(NETBSD_VER) && tar -C tmp-netbsd-$(NETBSD_VER) -jxf $(NETBSD_SRC) && mv tmp-netbsd-$(NETBSD_VER)/* $@
+	touch $@ # update timestamp to avoid rebuild
+
 pristine-netbsd-tools-src: 
 ifeq ($(NETBSD_TOOLS_SRC),)
 	@echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path $(NETBSD_SRC_PATH)"
@@ -30,14 +47,12 @@ netbsd-tools: pristine-netbsd-tools-src
 		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
+$(NETBSD_DIR): netbsd-tools pristine-netbsd-$(NETBSD_VER)
+	$(RM) -rf $(NETBSD_DIR)
+	cp -al pristine-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
+	# Apply arch-xen patches
 	( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
-          ./mkbuildtree ../netbsd-$(NETBSD_VER)-xenU )
+          ./mkbuildtree ../$(NETBSD_DIR) )
 
 # build the specified netbsd tree
 NBDIR = $(subst netbsd-,netbsd-$(NETBSD_VER)-,$@)
@@ -46,7 +61,5 @@ netbsd-xen%:
 	$(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
+	rm -rf $(NETBSD_TREES)