diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2007-08-17 13:28:53 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2007-08-17 13:28:53 +0100 |
| commit | bc39e90242a95eaae3d2340ab4eb09b666244b3e (patch) | |
| tree | 06868d23bd610dcee00007e67ed0d5b617911c8c /buildconfigs | |
| parent | 270415d3273daaf4b54d6e06488f0c9011e199eb (diff) | |
| download | xen-bc39e90242a95eaae3d2340ab4eb09b666244b3e.tar.gz xen-bc39e90242a95eaae3d2340ab4eb09b666244b3e.tar.bz2 xen-bc39e90242a95eaae3d2340ab4eb09b666244b3e.zip | |
Pull XEN_LINUX_UPDATE into mk.linux-2.6-xen so it can be shared by
src.tarball and src.hg-clone
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen | 14 | ||||
| -rw-r--r-- | buildconfigs/src.hg-clone | 14 | ||||
| -rw-r--r-- | buildconfigs/src.tarball | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index 4fd195b397..8abccd3894 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -7,6 +7,16 @@ EXTRAVERSION ?= -xen # repositories. LINUX_SRC_PATH ?= .:.. +# The source directory is not automatically updated to avoid blowing +# away developer's changes. If you want to automatically pull a new +# version of the Linux tree then add `XEN_LINUX_UPDATE=y' to your make +# command line. +ifeq ($(XEN_LINUX_UPDATE),y) +__XEN_LINUX_UPDATE = $(LINUX_SRCDIR)/.force-update +else +__XEN_LINUX_UPDATE = +endif + XEN_LINUX_SOURCE ?= hg-clone # Let XEN_TARGET_ARCH override ARCH. @@ -137,3 +147,7 @@ delete: mrproper: rm -rf $(LINUX_SRCDIR) rm -f linux-$(LINUX_VER).tar.bz2 + +.PHONY: $(LINUX_SRCDIR)/.force-update +$(LINUX_SRCDIR)/.force-update: + @ : diff --git a/buildconfigs/src.hg-clone b/buildconfigs/src.hg-clone index e1d7913c61..fa7f247e7e 100644 --- a/buildconfigs/src.hg-clone +++ b/buildconfigs/src.hg-clone @@ -6,16 +6,6 @@ LINUX_SRCDIR ?= linux-$(LINUX_VER)-xen.hg # Repository to clone. XEN_LINUX_HGREPO ?= $$(sh buildconfigs/select-repository $(LINUX_SRCDIR) $(LINUX_SRC_PATH)) -# The source directory is not automatically updated to avoid blowing -# away developer's changes. If you want to automatically pull a new -# version of the Linux tree then add `XEN_LINUX_UPDATE=y' to your make -# command line. -ifeq ($(XEN_LINUX_UPDATE),y) -__XEN_LINUX_UPDATE = $(LINUX_SRCDIR)/.force-update -else -__XEN_LINUX_UPDATE = -endif - # Set XEN_LINUX_HGREV to update to a particlar revision. XEN_LINUX_HGREV ?= tip @@ -40,7 +30,3 @@ $(LINUX_SRCDIR)/.valid-src: $(__XEN_LINUX_UPDATE) ( cd $(LINUX_SRCDIR) && $(HG) update $(XEN_LINUX_HGREV) ); \ fi touch $@ - -.PHONY: $(LINUX_SRCDIR)/.force-update -$(LINUX_SRCDIR)/.force-update: - @ : diff --git a/buildconfigs/src.tarball b/buildconfigs/src.tarball index 1a52c39410..176e6cc4f7 100644 --- a/buildconfigs/src.tarball +++ b/buildconfigs/src.tarball @@ -18,11 +18,11 @@ linux-%.tar.bz2: # XXX create a pristine tree for diff -Nurp convenience ifeq ($(XEN_LINUX_TARBALL_KETCHUP),y) -%/.valid-src: +%/.valid-src: $(__XEN_LINUX_UPDATE) $(KETCHUP) -d $(@D) $(LINUX_VER) touch $@ # update timestamp to avoid rebuild else -%/.valid-src: %.tar.bz2 +%/.valid-src: $(__XEN_LINUX_UPDATE) %.tar.bz2 rm -rf tmp-linux-$* $(@D) mkdir -p tmp-linux-$* tar -C tmp-linux-$* -jxf $< |