diff options
| author | emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com> | 2006-04-10 16:36:03 +0100 |
|---|---|---|
| committer | emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com> | 2006-04-10 16:36:03 +0100 |
| commit | 224cab0dfd3e7696fec21acf5e0cd821328fbe49 (patch) | |
| tree | d162a66094c2f8c5dbe26fc5dd0a84675c7de998 /buildconfigs/Rules.mk | |
| parent | 02e0e0d9bb791264722682d5dc26691e3a338803 (diff) | |
| parent | 9ffd98fa29fd8dc997529fa120d25446dbbc1bdd (diff) | |
| download | xen-224cab0dfd3e7696fec21acf5e0cd821328fbe49.tar.gz xen-224cab0dfd3e7696fec21acf5e0cd821328fbe49.tar.bz2 xen-224cab0dfd3e7696fec21acf5e0cd821328fbe49.zip | |
Merged.
Diffstat (limited to 'buildconfigs/Rules.mk')
| -rw-r--r-- | buildconfigs/Rules.mk | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index e4cb40def8..57df05e06b 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -40,29 +40,6 @@ patch-%.bz2: @echo "Cannot find $(@F) in path $(LINUX_SRC_PATH)" wget $(KERNEL_REPO)/pub/linux/kernel/v$(_LINUX_VDIR)/$(_LINUX_XDIR)/$(@F) -O./$@ -# Expand NetBSD release to NetBSD version -NETBSD_RELEASE ?= 2.0 -NETBSD_VER ?= $(patsubst netbsd-%-xen-sparse,%,$(wildcard netbsd-$(NETBSD_RELEASE)*-xen-sparse)) -NETBSD_CVSSNAP ?= 20050309 - -# Setup NetBSD search path -NETBSD_SRC_PATH ?= .:.. -vpath netbsd-%.tar.bz2 $(NETBSD_SRC_PATH) - -# download a pristine NetBSD tarball if there isn't one in NETBSD_SRC_PATH -netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2: - @echo "Cannot find $@ in path $(NETBSD_SRC_PATH)" - wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/$@ -O./$@ - -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-%: pristine-%/.valid-pristine @true @@ -124,27 +101,20 @@ linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref rm -rf tmp-$@ cp -al $(<D) tmp-$@ ( cd linux-2.6-xen-sparse && ./mkbuildtree ../tmp-$@ ) - diff -Nurp $(<D) tmp-$@ > $@ || true + diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true rm -rf tmp-$@ %-xen.patch: ref-%/.valid-ref rm -rf tmp-$@ cp -al $(<D) tmp-$@ ( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ ) - diff -Nurp $(<D) tmp-$@ > $@ || true + diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true rm -rf tmp-$@ -%-mrproper: %-mrproper-extra +%-mrproper: rm -rf pristine-$(*)* ref-$(*)* $*.tar.bz2 rm -rf $*-xen.patch -netbsd-%-mrproper-extra: - rm -rf netbsd-$*-tools netbsd-$*-tools.tar.bz2 - rm -f netbsd-$*-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2 - -%-mrproper-extra: - @: # do nothing - config-update-pae: ifeq ($(XEN_TARGET_X86_PAE),y) sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) |