ia64/xen-unstable

changeset 2844:4fdcd6139bf0

bitkeeper revision 1.1159.1.348 (4188dd20H8_2AnNrTZaViP9haZ8hzw)

trivial make cleanup
author iap10@labyrinth.cl.cam.ac.uk
date Wed Nov 03 13:29:04 2004 +0000 (2004-11-03)
parents afb0d3c20bea
children a8ee20a0480f 83a23cb75277
files buildconfigs/Rules.mk buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU buildconfigs/mk.netbsd-2.0-xenU
line diff
     1.1 --- a/buildconfigs/Rules.mk	Wed Nov 03 13:20:51 2004 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Wed Nov 03 13:29:04 2004 +0000
     1.3 @@ -31,7 +31,7 @@ LINUX_26SRC := ./linux-$(LINUX_26VER).ta
     1.4  endif
     1.5  
     1.6  pristine-linux-$(LINUX_26VER): $(LINUX_26SRC)
     1.7 -	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)/* $@
     1.8 +	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)
     1.9  	touch $@ # update timestamp to avoid rebuild
    1.10  
    1.11  
    1.12 @@ -44,7 +44,7 @@ LINUX_24SRC := ./linux-$(LINUX_24VER).ta
    1.13  endif
    1.14  
    1.15  pristine-linux-$(LINUX_24VER): $(LINUX_24SRC)
    1.16 -	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)/* $@
    1.17 +	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)
    1.18  	touch $@ # update timestamp to avoid rebuild
    1.19  
    1.20  linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER)	
     2.1 --- a/buildconfigs/mk.linux-2.4-xen0	Wed Nov 03 13:20:51 2004 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Wed Nov 03 13:29:04 2004 +0000
     2.3 @@ -5,18 +5,20 @@ FULLVERSION  = $(LINUX_24VER)-$(EXTRAVER
     2.4  
     2.5  LINUX_DIR    = linux-$(FULLVERSION)
     2.6  
     2.7 -.PHONY: build clean mrproper mkpatch
     2.8 -
     2.9  include buildconfigs/Rules.mk
    2.10  
    2.11 -.PHONY: build clean mrproper mkpatch
    2.12 +.PHONY: build clean delete
    2.13  
    2.14 +# The real action starts here!
    2.15 +build: $(LINUX_DIR)
    2.16 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
    2.17 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    2.18 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    2.19  
    2.20  patches/ebtables.diff:
    2.21  	mkdir -p patches
    2.22  	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
    2.23  
    2.24 -# The real action starts here!
    2.25  $(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
    2.26  	rm -rf $(LINUX_DIR)
    2.27  	cp -al pristine-linux-$(LINUX_24VER) $(LINUX_DIR)
    2.28 @@ -34,11 +36,6 @@ patches/ebtables.diff:
    2.29  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    2.30  	make -C $(LINUX_DIR) ARCH=xen dep
    2.31  
    2.32 -build: $(LINUX_DIR)
    2.33 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
    2.34 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    2.35 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    2.36 -
    2.37  clean:
    2.38  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    2.39  
     3.1 --- a/buildconfigs/mk.linux-2.4-xenU	Wed Nov 03 13:20:51 2004 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Wed Nov 03 13:29:04 2004 +0000
     3.3 @@ -5,18 +5,20 @@ FULLVERSION  = $(LINUX_24VER)-$(EXTRAVER
     3.4  
     3.5  LINUX_DIR    = linux-$(FULLVERSION)
     3.6  
     3.7 -.PHONY: build clean mrproper mkpatch
     3.8 -
     3.9  include buildconfigs/Rules.mk
    3.10  
    3.11 -.PHONY: build clean mrproper mkpatch
    3.12 +.PHONY: build clean delete
    3.13  
    3.14 +# The real action starts here!
    3.15 +build: $(LINUX_DIR)
    3.16 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules	
    3.17 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    3.18 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    3.19  
    3.20  patches/ebtables.diff:
    3.21  	mkdir -p patches
    3.22  	wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
    3.23  
    3.24 -# The real action starts here!
    3.25  $(LINUX_DIR):  pristine-linux-$(LINUX_24VER) patches/ebtables.diff
    3.26  	rm -rf $(LINUX_DIR)
    3.27  	cp -al pristine-linux-$(LINUX_24VER) $(LINUX_DIR)
    3.28 @@ -32,11 +34,6 @@ patches/ebtables.diff:
    3.29  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    3.30  	make -C $(LINUX_DIR) ARCH=xen dep
    3.31  
    3.32 -build: $(LINUX_DIR)
    3.33 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules	
    3.34 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    3.35 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    3.36 -
    3.37  clean:
    3.38  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    3.39  
     4.1 --- a/buildconfigs/mk.linux-2.6-xen0	Wed Nov 03 13:20:51 2004 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Wed Nov 03 13:29:04 2004 +0000
     4.3 @@ -5,11 +5,14 @@ FULLVERSION  = $(LINUX_26VER)-$(EXTRAVER
     4.4  
     4.5  LINUX_DIR    = linux-$(FULLVERSION)
     4.6  
     4.7 -.PHONY: build clean mrproper mkpatch
     4.8 -
     4.9  include buildconfigs/Rules.mk
    4.10  
    4.11 -.PHONY: build clean mrproper mkpatch
    4.12 +.PHONY: build clean delete
    4.13 +
    4.14 +build: $(LINUX_DIR)
    4.15 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
    4.16 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    4.17 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    4.18  
    4.19  # The real action starts here!
    4.20  $(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
    4.21 @@ -26,11 +29,6 @@ include buildconfigs/Rules.mk
    4.22  	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
    4.23  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    4.24  
    4.25 -build: $(LINUX_DIR)
    4.26 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
    4.27 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    4.28 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    4.29 -
    4.30  clean:
    4.31  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    4.32  
     5.1 --- a/buildconfigs/mk.linux-2.6-xenU	Wed Nov 03 13:20:51 2004 +0000
     5.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Wed Nov 03 13:29:04 2004 +0000
     5.3 @@ -5,13 +5,17 @@ FULLVERSION  = $(LINUX_26VER)-$(EXTRAVER
     5.4  
     5.5  LINUX_DIR    = linux-$(FULLVERSION)
     5.6  
     5.7 -.PHONY: build clean mrproper mkpatch
     5.8 -
     5.9  include buildconfigs/Rules.mk
    5.10  
    5.11 -.PHONY: build clean mrproper mkpatch
    5.12 +.PHONY: build clean delete
    5.13  
    5.14  # The real action starts here!
    5.15 +build: $(LINUX_DIR)
    5.16 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
    5.17 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    5.18 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    5.19 +
    5.20 +
    5.21  $(LINUX_DIR):  pristine-linux-$(LINUX_26VER)
    5.22  	rm -rf $(LINUX_DIR)
    5.23  	cp -al pristine-linux-$(LINUX_26VER) $(LINUX_DIR)
    5.24 @@ -26,11 +30,6 @@ include buildconfigs/Rules.mk
    5.25  	cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
    5.26  	make -C $(LINUX_DIR) ARCH=xen oldconfig
    5.27  
    5.28 -build: $(LINUX_DIR)
    5.29 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
    5.30 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
    5.31 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    5.32 -
    5.33  clean:
    5.34  	$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
    5.35  
     6.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Wed Nov 03 13:20:51 2004 +0000
     6.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Wed Nov 03 13:29:04 2004 +0000
     6.3 @@ -1,5 +1,16 @@
     6.4  
     6.5  NETBSD_RELEASE   ?= 2.0
     6.6 +
     6.7 +EXTRAVERSION = xenU
     6.8 +
     6.9 +FULLVERSION  = $(NETBSD_VER)-$(EXTRAVERSION)
    6.10 +
    6.11 +NETBSD_DIR   = netbsd-$(FULLVERSION)
    6.12 +
    6.13 +.PHONY: build clean mrproper mkpatch
    6.14 +
    6.15 +include buildconfigs/Rules.mk
    6.16 +
    6.17  NETBSD_VER       ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \
    6.18  		      sed -e 's!^.*netbsd-\(.\+\)-xen-sparse!\1!' )
    6.19  NETBSD_CVSSNAP   ?= 20040906
    6.20 @@ -11,13 +22,19 @@ NETBSD_TOOLS_SRC ?= $(firstword $(foreac
    6.21  
    6.22  NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU
    6.23  
    6.24 -pristine-netbsd-src: 
    6.25 +build: $(NETBSD_DIR) netbsd-$(EXTRAVERSION)
    6.26 +
    6.27 +netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
    6.28  ifeq ($(NETBSD_SRC),)
    6.29  	@echo "Cannot find netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.gz in path $(NETBSD_SRC_PATH)"
    6.30  	@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
    6.31  NETBSD_SRC := ./netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 
    6.32  endif
    6.33  
    6.34 +pristine-netbsd-$(NETBSD_VER): $(NETBSD_SRC)
    6.35 +	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)/* $@
    6.36 +	touch $@ # update timestamp to avoid rebuild
    6.37 +
    6.38  pristine-netbsd-tools-src: 
    6.39  ifeq ($(NETBSD_TOOLS_SRC),)
    6.40  	@echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path $(NETBSD_SRC_PATH)"
    6.41 @@ -30,14 +47,12 @@ netbsd-tools: pristine-netbsd-tools-src
    6.42  		echo extract $(NETBSD_TOOLS_SRC); \
    6.43  		tar -jxf $(NETBSD_TOOLS_SRC); }
    6.44  
    6.45 -mk-netbsd-trees: netbsd-tools pristine-netbsd-src 
    6.46 -	$(RM) -rf $(NETBSD_TREES)
    6.47 -	echo $(NETBSD_SRC) | grep -q bz2 && \
    6.48 -	    tar -jxf $(NETBSD_SRC) || tar -zxf $(NETBSD_SRC)
    6.49 -	mv netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP) \
    6.50 -	    netbsd-$(NETBSD_VER)-xenU
    6.51 +$(NETBSD_DIR): netbsd-tools pristine-netbsd-$(NETBSD_VER)
    6.52 +	$(RM) -rf $(NETBSD_DIR)
    6.53 +	cp -al pristine-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
    6.54 +	# Apply arch-xen patches
    6.55  	( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
    6.56 -          ./mkbuildtree ../netbsd-$(NETBSD_VER)-xenU )
    6.57 +          ./mkbuildtree ../$(NETBSD_DIR) )
    6.58  
    6.59  # build the specified netbsd tree
    6.60  NBDIR = $(subst netbsd-,netbsd-$(NETBSD_VER)-,$@)
    6.61 @@ -46,7 +61,5 @@ netbsd-xen%:
    6.62  	$(MAKE) -C $(NBDIR) netbsd
    6.63  	$(MAKE) -C $(NBDIR) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
    6.64  
    6.65 -build: $(NETBSD_TREES)
    6.66 -
    6.67  delete:
    6.68 -	rm -rf $(NETBSD_TREES)
    6.69 \ No newline at end of file
    6.70 +	rm -rf $(NETBSD_TREES)