mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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>
This commit is contained in:
Ian Campbell committed
1 parent
270415d327
commit
bc39e90242
3 files changed
+16
-16
No files matched your search
@@ -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:
|
||||
@ :
|
||||
@@ -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:
|
||||
@ :
|
||||
@@ -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 $<
|
||||
|
||||