ia64/xen-unstable

changeset 2899:574f6a7c8697

bitkeeper revision 1.1159.1.380 (418ab5a2xXnW5CFXsiZAFTOcTkURYw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/testbuild/xen-unstable.bk
author cl349@freefall.cl.cam.ac.uk
date Thu Nov 04 23:05:06 2004 +0000 (2004-11-04)
parents a96369f318e2 22b46129937d
children 796eb5765fcc
files buildconfigs/Rules.mk buildconfigs/mk.netbsd-2.0-xenU
line diff
     1.1 --- a/buildconfigs/Rules.mk	Thu Nov 04 22:22:17 2004 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Thu Nov 04 23:05:06 2004 +0000
     1.3 @@ -19,7 +19,7 @@ vpath linux-%.tar.bz2 $(LINUX_SRC_PATH)
     1.4  # download a pristine Linux kernel tarball if there isn't one in LINUX_SRC_PATH
     1.5  linux-%.tar.bz2: override _LINUX_VDIR = $(word 1,$(subst ., ,$*)).$(word 2,$(subst ., ,$*))
     1.6  linux-%.tar.bz2:
     1.7 -	echo "Cannot find linux-$*.tar.bz2 in path $(LINUX_SRC_PATH)"
     1.8 +	@echo "Cannot find linux-$*.tar.bz2 in path $(LINUX_SRC_PATH)"
     1.9  	wget http://www.kernel.org/pub/linux/kernel/v$(_LINUX_VDIR)/linux-$*.tar.bz2 -O./$@
    1.10  
    1.11  
    1.12 @@ -35,7 +35,7 @@ vpath netbsd-%.tar.bz2 $(NETBSD_SRC_PATH
    1.13  
    1.14  # download a pristine NetBSD tarball if there isn't one in NETBSD_SRC_PATH
    1.15  netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
    1.16 -	echo "Cannot find $@ in path $(NETBSD_SRC_PATH)"
    1.17 +	@echo "Cannot find $@ in path $(NETBSD_SRC_PATH)"
    1.18  	wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 -O./$@
    1.19  
    1.20  netbsd-%.tar.bz2: netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
     2.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Thu Nov 04 22:22:17 2004 +0000
     2.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Thu Nov 04 23:05:06 2004 +0000
     2.3 @@ -12,32 +12,26 @@ NETBSD_DIR   = netbsd-$(FULLVERSION)
     2.4  
     2.5  include buildconfigs/Rules.mk
     2.6  
     2.7 -build: $(NETBSD_DIR) netbsd-$(EXTRAVERSION)
     2.8 +build: netbsd-$(EXTRAVERSION)
     2.9  
    2.10 -NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
    2.11 -                    $(wildcard $(dir)/netbsd-$(NETBSD_VER)-tools.tar.*z*)))
    2.12 -
    2.13 -netbsd-tools-src: 
    2.14 -ifeq ($(NETBSD_TOOLS_SRC),)
    2.15 +netbsd-%-tools.tar.bz2:
    2.16  	@echo "Cannot find netbsd-$(NETBSD_VER)-tools.tar.gz in path $(NETBSD_SRC_PATH)"
    2.17 -	@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
    2.18 -NETBSD_TOOLS_SRC := ./netbsd-$(NETBSD_VER)-tools.tar.bz2 
    2.19 -endif
    2.20 +	wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/netbsd-$*-tools.tar.bz2 -O./$@
    2.21  
    2.22 -netbsd-tools: netbsd-tools-src
    2.23 -	@[ -d netbsd-$(NETBSD_RELEASE)-tools ] || { \
    2.24 -		echo extract $(NETBSD_TOOLS_SRC); \
    2.25 -		tar -jxf $(NETBSD_TOOLS_SRC); }
    2.26 +netbsd-%-tools: netbsd-%-tools.tar.bz2
    2.27 +	tar -jxf netbsd-$*-tools.tar.bz2
    2.28 +	touch $@ # update timestamp to avoid rebuild
    2.29  
    2.30 -$(NETBSD_DIR): netbsd-tools pristine-netbsd-$(NETBSD_VER)
    2.31 +$(NETBSD_DIR)/.valid: pristine-netbsd-$(NETBSD_VER)
    2.32  	$(RM) -rf $(NETBSD_DIR)
    2.33  	cp -al pristine-netbsd-$(NETBSD_VER) $(NETBSD_DIR)
    2.34  	# Apply arch-xen patches
    2.35  	( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
    2.36            ./mkbuildtree ../$(NETBSD_DIR) )
    2.37 +	@touch $(NETBSD_DIR)/.valid
    2.38  
    2.39  # build the specified netbsd tree
    2.40 -netbsd-xen%:	
    2.41 +netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools
    2.42  	$(MAKE) -C netbsd-$(FULLVERSION) config
    2.43  	$(MAKE) -C netbsd-$(FULLVERSION) netbsd
    2.44  	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install