Mailing List Archive

# HG changeset patch
# User Ian Campbell <ian.campbell@xensource.com>
# Date 1187353733 -3600
# Node ID a1b6555a37bf9c8bfaa05dfee7ebb9cab3882ac5
# Parent bd8647a7b992c01743e89b7d0d6b258774acee53
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>
---
buildconfigs/mk.linux-2.6-xen | 14 ++++++++++++++
buildconfigs/src.hg-clone | 14 --------------
buildconfigs/src.tarball | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)

diff -r bd8647a7b992 -r a1b6555a37bf buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen Fri Aug 17 10:02:52 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-xen Fri Aug 17 13:28:53 2007 +0100
@@ -6,6 +6,16 @@ EXTRAVERSION ?= -xen
# Linux search path, will be searched for tarballs and mercurial
# 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

@@ -137,3 +147,7 @@ mrproper:
mrproper:
rm -rf $(LINUX_SRCDIR)
rm -f linux-$(LINUX_VER).tar.bz2
+
+.PHONY: $(LINUX_SRCDIR)/.force-update
+$(LINUX_SRCDIR)/.force-update:
+ @ :
diff -r bd8647a7b992 -r a1b6555a37bf buildconfigs/src.hg-clone
--- a/buildconfigs/src.hg-clone Fri Aug 17 10:02:52 2007 +0100
+++ b/buildconfigs/src.hg-clone Fri Aug 17 13:28:53 2007 +0100
@@ -5,16 +5,6 @@ LINUX_SRCDIR ?= linux-$(LINUX_VER)-xen.h

# 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 @@ XEN_LINUX_HGREV ?= tip
( cd $(LINUX_SRCDIR) && $(HG) update $(XEN_LINUX_HGREV) ); \
fi
touch $@
-
-.PHONY: $(LINUX_SRCDIR)/.force-update
-$(LINUX_SRCDIR)/.force-update:
- @ :
diff -r bd8647a7b992 -r a1b6555a37bf buildconfigs/src.tarball
--- a/buildconfigs/src.tarball Fri Aug 17 10:02:52 2007 +0100
+++ b/buildconfigs/src.tarball Fri Aug 17 13:28:53 2007 +0100
@@ -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 $<

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog