ia64/xen-unstable

changeset 2847:42df95ee8ac3

bitkeeper revision 1.1159.1.350 (4188ec7beZxCEEQJKkCn2Ht65pN6hA)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-testbuild
author cl349@freefall.cl.cam.ac.uk
date Wed Nov 03 14:34:35 2004 +0000 (2004-11-03)
parents a8ee20a0480f 83a23cb75277
children 00560d53e611 9e8025840eed
files buildconfigs/Rules.mk buildconfigs/mk.netbsd-2.0-xenU netbsd-2.0-xen-sparse/Makefile
line diff
     1.1 --- a/buildconfigs/Rules.mk	Wed Nov 03 13:53:15 2004 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Wed Nov 03 14:34:35 2004 +0000
     1.3 @@ -31,8 +31,12 @@ 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)/* $@ ; rm -rf tmp-linux-$(LINUX_26VER)
     1.8 +	rm -rf tmp-linux-$(LINUX_26VER) $@ && \
     1.9 +	mkdir -p tmp-linux-$(LINUX_26VER) && \
    1.10 +	tar -C tmp-linux-$(LINUX_26VER) -jxf $(LINUX_26SRC) && \
    1.11 +	mv tmp-linux-$(LINUX_26VER)/* $@
    1.12  	touch $@ # update timestamp to avoid rebuild
    1.13 +	@rm -rf tmp-linux-$(LINUX_26VER)
    1.14  
    1.15  
    1.16  # search for a pristine kernel tar ball, or try downloading one
    1.17 @@ -44,8 +48,12 @@ LINUX_24SRC := ./linux-$(LINUX_24VER).ta
    1.18  endif
    1.19  
    1.20  pristine-linux-$(LINUX_24VER): $(LINUX_24SRC)
    1.21 -	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.22 +	rm -rf tmp-linux-$(LINUX_24VER) $@ && \
    1.23 +	mkdir -p tmp-linux-$(LINUX_24VER) && \
    1.24 +	tar -C tmp-linux-$(LINUX_24VER) -jxf $(LINUX_24SRC) && \
    1.25 +	mv tmp-linux-$(LINUX_24VER)/* $@ && \
    1.26  	touch $@ # update timestamp to avoid rebuild
    1.27 +	@rm -rf tmp-linux-$(LINUX_24VER)
    1.28  
    1.29  linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER)	
    1.30  	rm -rf tmp-$@
    1.31 @@ -69,4 +77,4 @@ mrproper:
    1.32  	rm -rf pristine-linux-$(LINUX_24VER) linux-$(LINUX_24VER).tar.bz2
    1.33  	rm -rf pristine-linux-$(LINUX_26VER) linux-$(LINUX_26VER).tar.bz2
    1.34  	rm -rf linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
    1.35 -	rm -rf pristine-netbsd-2.0
    1.36 +	rm -rf pristine-netbsd-2.0 netbsd-2.0-tools
     2.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Wed Nov 03 13:53:15 2004 +0000
     2.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Wed Nov 03 14:34:35 2004 +0000
     2.3 @@ -20,8 +20,6 @@ NETBSD_SRC       ?= $(firstword $(foreac
     2.4  NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
     2.5                      $(wildcard $(dir)/netbsd-$(NETBSD_VER)-tools.tar.*z*)))
     2.6  
     2.7 -NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU
     2.8 -
     2.9  build: $(NETBSD_DIR) netbsd-$(EXTRAVERSION)
    2.10  
    2.11  netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
    2.12 @@ -32,8 +30,12 @@ NETBSD_SRC := ./netbsd-$(NETBSD_VER)-xen
    2.13  endif
    2.14  
    2.15  pristine-netbsd-$(NETBSD_VER): $(NETBSD_SRC)
    2.16 -	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)/* $@
    2.17 +	rm -rf tmp-netbsd-$(NETBSD_VER) $@ && \
    2.18 +	mkdir -p tmp-netbsd-$(NETBSD_VER) && \
    2.19 +	tar -C tmp-netbsd-$(NETBSD_VER) -jxf $(NETBSD_SRC) && \
    2.20 +	mv tmp-netbsd-$(NETBSD_VER)/* $@
    2.21  	touch $@ # update timestamp to avoid rebuild
    2.22 +	@rm -rf tmp-netbsd-$(NETBSD_VER)
    2.23  
    2.24  pristine-netbsd-tools-src: 
    2.25  ifeq ($(NETBSD_TOOLS_SRC),)
    2.26 @@ -55,11 +57,13 @@ netbsd-tools: pristine-netbsd-tools-src
    2.27            ./mkbuildtree ../$(NETBSD_DIR) )
    2.28  
    2.29  # build the specified netbsd tree
    2.30 -NBDIR = $(subst netbsd-,netbsd-$(NETBSD_VER)-,$@)
    2.31  netbsd-xen%:	
    2.32 -	$(MAKE) -C $(NBDIR) config
    2.33 -	$(MAKE) -C $(NBDIR) netbsd
    2.34 -	$(MAKE) -C $(NBDIR) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
    2.35 +	$(MAKE) -C netbsd-$(FULLVERSION) config
    2.36 +	$(MAKE) -C netbsd-$(FULLVERSION) netbsd
    2.37 +	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
    2.38 +
    2.39 +clean:
    2.40 +	$(MAKE) -C netbsd-$(FULLVERSION) clean
    2.41  
    2.42  delete:
    2.43 -	rm -rf $(NETBSD_TREES)
    2.44 +	rm -rf tmp-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
     3.1 --- a/netbsd-2.0-xen-sparse/Makefile	Wed Nov 03 13:53:15 2004 +0000
     3.2 +++ b/netbsd-2.0-xen-sparse/Makefile	Wed Nov 03 14:34:35 2004 +0000
     3.3 @@ -2,12 +2,16 @@
     3.4  #
     3.5  #
     3.6  
     3.7 -.PHONY: config netbsd
     3.8 +.PHONY: clean config install netbsd
     3.9  
    3.10  TOPDIR		?= $(shell pwd)
    3.11  NETBSD_RELEASE	?= $(patsubst netbsd-%-xen%,%,$(notdir $(TOPDIR)))
    3.12  NETBSD_VER	?= $(patsubst netbsd-%-xen%,%,$(notdir $(TOPDIR)))
    3.13  
    3.14 +clean:
    3.15 +	@mkdir -p compile/XEN
    3.16 +	cd compile/XEN && TOPDIR=$(TOPDIR) NETBSD_VER=$(NETBSD_VER) ../../nbmake-xen cleandir
    3.17 +
    3.18  config:
    3.19  	@mkdir -p compile/XEN
    3.20  	cd compile/XEN && TOPDIR=$(TOPDIR) NETBSD_VER=$(NETBSD_VER) ../../nbconfig-xen XEN