diff options
| author | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-03 14:34:35 +0000 |
|---|---|---|
| committer | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-03 14:34:35 +0000 |
| commit | 129eeeb2355df53999040179046df7cc79f637bd (patch) | |
| tree | a87ab88cbb81d58b0589e35591646b2344b81587 | |
| parent | a55a6ac0c17a69f0d7cdc6521655e2b3da04a6e9 (diff) | |
| parent | aa0dad2547223bea4fef6a5a3cf957223488aa4b (diff) | |
| download | xen-129eeeb2355df53999040179046df7cc79f637bd.tar.gz xen-129eeeb2355df53999040179046df7cc79f637bd.tar.bz2 xen-129eeeb2355df53999040179046df7cc79f637bd.zip | |
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
| -rw-r--r-- | buildconfigs/Rules.mk | 14 | ||||
| -rw-r--r-- | buildconfigs/mk.netbsd-2.0-xenU | 20 | ||||
| -rw-r--r-- | netbsd-2.0-xen-sparse/Makefile | 6 |
3 files changed, 28 insertions, 12 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 8167d5f386..17826830f3 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -31,8 +31,12 @@ 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) + 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 + @rm -rf tmp-linux-$(LINUX_26VER) # search for a pristine kernel tar ball, or try downloading one @@ -44,8 +48,12 @@ 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) + 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 + @rm -rf tmp-linux-$(LINUX_24VER) linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER) rm -rf tmp-$@ @@ -69,4 +77,4 @@ 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 - rm -rf pristine-netbsd-2.0 + rm -rf pristine-netbsd-2.0 netbsd-2.0-tools diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU index f5f34c0eb1..0e2ae60faa 100644 --- a/buildconfigs/mk.netbsd-2.0-xenU +++ b/buildconfigs/mk.netbsd-2.0-xenU @@ -20,8 +20,6 @@ NETBSD_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\ NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\ $(wildcard $(dir)/netbsd-$(NETBSD_VER)-tools.tar.*z*))) -NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU - build: $(NETBSD_DIR) netbsd-$(EXTRAVERSION) netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2: @@ -32,8 +30,12 @@ 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)/* $@ + 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 + @rm -rf tmp-netbsd-$(NETBSD_VER) pristine-netbsd-tools-src: ifeq ($(NETBSD_TOOLS_SRC),) @@ -55,11 +57,13 @@ $(NETBSD_DIR): netbsd-tools pristine-netbsd-$(NETBSD_VER) ./mkbuildtree ../$(NETBSD_DIR) ) # 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 + $(MAKE) -C netbsd-$(FULLVERSION) config + $(MAKE) -C netbsd-$(FULLVERSION) netbsd + $(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install + +clean: + $(MAKE) -C netbsd-$(FULLVERSION) clean delete: - rm -rf $(NETBSD_TREES) + rm -rf tmp-netbsd-$(NETBSD_VER) $(NETBSD_DIR) diff --git a/netbsd-2.0-xen-sparse/Makefile b/netbsd-2.0-xen-sparse/Makefile index def3b4427e..da82172aad 100644 --- a/netbsd-2.0-xen-sparse/Makefile +++ b/netbsd-2.0-xen-sparse/Makefile @@ -2,12 +2,16 @@ # # -.PHONY: config netbsd +.PHONY: clean config install netbsd TOPDIR ?= $(shell pwd) NETBSD_RELEASE ?= $(patsubst netbsd-%-xen%,%,$(notdir $(TOPDIR))) NETBSD_VER ?= $(patsubst netbsd-%-xen%,%,$(notdir $(TOPDIR))) +clean: + @mkdir -p compile/XEN + cd compile/XEN && TOPDIR=$(TOPDIR) NETBSD_VER=$(NETBSD_VER) ../../nbmake-xen cleandir + config: @mkdir -p compile/XEN cd compile/XEN && TOPDIR=$(TOPDIR) NETBSD_VER=$(NETBSD_VER) ../../nbconfig-xen XEN |