ia64/xen-unstable

changeset 15775:a1b6555a37bf

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>
author Ian Campbell <ian.campbell@xensource.com>
date Fri Aug 17 13:28:53 2007 +0100 (2007-08-17)
parents bd8647a7b992
children ae923d1f50bf
files buildconfigs/mk.linux-2.6-xen buildconfigs/src.hg-clone buildconfigs/src.tarball
line diff
     1.1 --- a/buildconfigs/mk.linux-2.6-xen	Fri Aug 17 10:02:52 2007 +0100
     1.2 +++ b/buildconfigs/mk.linux-2.6-xen	Fri Aug 17 13:28:53 2007 +0100
     1.3 @@ -7,6 +7,16 @@ EXTRAVERSION ?= -xen
     1.4  # repositories.
     1.5  LINUX_SRC_PATH ?= .:..
     1.6  
     1.7 +# The source directory is not automatically updated to avoid blowing
     1.8 +# away developer's changes. If you want to automatically pull a new
     1.9 +# version of the Linux tree then add `XEN_LINUX_UPDATE=y' to your make
    1.10 +# command line.
    1.11 +ifeq ($(XEN_LINUX_UPDATE),y)
    1.12 +__XEN_LINUX_UPDATE = $(LINUX_SRCDIR)/.force-update
    1.13 +else
    1.14 +__XEN_LINUX_UPDATE =
    1.15 +endif
    1.16 +
    1.17  XEN_LINUX_SOURCE ?= hg-clone
    1.18  
    1.19  # Let XEN_TARGET_ARCH override ARCH.
    1.20 @@ -137,3 +147,7 @@ delete:
    1.21  mrproper:
    1.22  	rm -rf $(LINUX_SRCDIR)
    1.23  	rm -f linux-$(LINUX_VER).tar.bz2
    1.24 +
    1.25 +.PHONY: $(LINUX_SRCDIR)/.force-update
    1.26 +$(LINUX_SRCDIR)/.force-update:
    1.27 +	@ :
     2.1 --- a/buildconfigs/src.hg-clone	Fri Aug 17 10:02:52 2007 +0100
     2.2 +++ b/buildconfigs/src.hg-clone	Fri Aug 17 13:28:53 2007 +0100
     2.3 @@ -6,16 +6,6 @@ LINUX_SRCDIR ?= linux-$(LINUX_VER)-xen.h
     2.4  # Repository to clone.
     2.5  XEN_LINUX_HGREPO ?= $$(sh buildconfigs/select-repository $(LINUX_SRCDIR) $(LINUX_SRC_PATH))
     2.6  
     2.7 -# The source directory is not automatically updated to avoid blowing
     2.8 -# away developer's changes. If you want to automatically pull a new
     2.9 -# version of the Linux tree then add `XEN_LINUX_UPDATE=y' to your make
    2.10 -# command line.
    2.11 -ifeq ($(XEN_LINUX_UPDATE),y)
    2.12 -__XEN_LINUX_UPDATE = $(LINUX_SRCDIR)/.force-update
    2.13 -else
    2.14 -__XEN_LINUX_UPDATE =
    2.15 -endif
    2.16 -
    2.17  # Set XEN_LINUX_HGREV to update to a particlar revision.
    2.18  XEN_LINUX_HGREV  ?= tip
    2.19  
    2.20 @@ -40,7 +30,3 @@ XEN_LINUX_HGREV  ?= tip
    2.21  	    ( cd $(LINUX_SRCDIR) && $(HG) update $(XEN_LINUX_HGREV) ); \
    2.22  	fi
    2.23  	touch $@
    2.24 -
    2.25 -.PHONY: $(LINUX_SRCDIR)/.force-update
    2.26 -$(LINUX_SRCDIR)/.force-update:
    2.27 -	@ :
     3.1 --- a/buildconfigs/src.tarball	Fri Aug 17 10:02:52 2007 +0100
     3.2 +++ b/buildconfigs/src.tarball	Fri Aug 17 13:28:53 2007 +0100
     3.3 @@ -18,11 +18,11 @@ linux-%.tar.bz2:
     3.4  # XXX create a pristine tree for diff -Nurp convenience
     3.5  
     3.6  ifeq ($(XEN_LINUX_TARBALL_KETCHUP),y)
     3.7 -%/.valid-src:
     3.8 +%/.valid-src: $(__XEN_LINUX_UPDATE)
     3.9  	$(KETCHUP) -d $(@D) $(LINUX_VER)
    3.10  	touch $@ # update timestamp to avoid rebuild
    3.11  else
    3.12 -%/.valid-src: %.tar.bz2
    3.13 +%/.valid-src: $(__XEN_LINUX_UPDATE) %.tar.bz2
    3.14  	rm -rf tmp-linux-$* $(@D)
    3.15  	mkdir -p tmp-linux-$*
    3.16  	tar -C tmp-linux-$* -jxf $<