diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-12 13:08:06 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-12 13:08:06 +0000 |
| commit | 3325b7e9bb537a6ff0011f569a73b78e8abea79a (patch) | |
| tree | 83733ff90fbe48a584ff527eeeeb866cf32a1aa7 /buildconfigs/Rules.mk | |
| parent | 6069383c3e31df856acd6ebab020958be97ed624 (diff) | |
| parent | 27daa2be17ca314e35e778e41a1ba2a0e3992e3c (diff) | |
| download | xen-3325b7e9bb537a6ff0011f569a73b78e8abea79a.tar.gz xen-3325b7e9bb537a6ff0011f569a73b78e8abea79a.tar.bz2 xen-3325b7e9bb537a6ff0011f569a73b78e8abea79a.zip | |
bitkeeper revision 1.1389.1.42 (42835536rA-h77TrcPbgY_ReOoY4bQ)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
Diffstat (limited to 'buildconfigs/Rules.mk')
| -rw-r--r-- | buildconfigs/Rules.mk | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 58109fd619..11f4009525 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -43,6 +43,12 @@ netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2: netbsd-%.tar.bz2: netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 ln -fs $< $@ +ifeq ($(OS),linux) +OS_VER = $(LINUX_VER) +else +OS_VER = $(NETBSD_VER) +endif + pristine-%: %.tar.bz2 rm -rf tmp-$(@F) $@ mkdir -p tmp-$(@F) @@ -51,9 +57,17 @@ pristine-%: %.tar.bz2 touch $@ # update timestamp to avoid rebuild touch $@/.bk_skip @rm -rf tmp-$(@F) + +OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch) + +ref-%: pristine-% $(OS_PATCHES) + rm -rf $@ + cp -al $< tmp-$(@F) [ -d patches/$* ] && \ - for i in patches/$*/*.patch ; do ( cd $@ ; patch -p1 <../$$i ) ; done || \ + for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) ; done || \ true + mv tmp-$(@F) $@ + touch $@ # update timestamp to avoid rebuild %-build: $(MAKE) -f buildconfigs/mk.$* build @@ -67,7 +81,7 @@ pristine-%: %.tar.bz2 %-config: $(MAKE) -f buildconfigs/mk.$* config -%-xen.patch: pristine-% +%-xen.patch: ref-% rm -rf tmp-$@ cp -al $< tmp-$@ ( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ ) @@ -75,7 +89,7 @@ pristine-%: %.tar.bz2 rm -rf tmp-$@ %-mrproper: %-mrproper-extra - rm -rf pristine-$* $*.tar.bz2 + rm -rf pristine-$* ref-$* $*.tar.bz2 rm -rf $*-xen.patch netbsd-%-mrproper-extra: |