aboutsummaryrefslogtreecommitdiffstats
path: root/buildconfigs
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@xensource.com>2007-10-30 16:01:07 +0000
committerIan Campbell <ian.campbell@xensource.com>2007-10-30 16:01:07 +0000
commitfe875c5098fe8d1fa20f203e5a777c1a91010559 (patch)
tree26bf74e9f2a04b6840ceb9323e3fd130051d6fa1 /buildconfigs
parente368009768868afdd505fd5e14871a1513f6b209 (diff)
downloadxen-fe875c5098fe8d1fa20f203e5a777c1a91010559.tar.gz
xen-fe875c5098fe8d1fa20f203e5a777c1a91010559.tar.bz2
xen-fe875c5098fe8d1fa20f203e5a777c1a91010559.zip
Always use ketchup for tarball sources, since the only non-user was
the paravirt tree. Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Diffstat (limited to 'buildconfigs')
-rw-r--r--buildconfigs/mk.linux-2.62
-rw-r--r--buildconfigs/src.tarball14
2 files changed, 0 insertions, 16 deletions
diff --git a/buildconfigs/mk.linux-2.6 b/buildconfigs/mk.linux-2.6
index 07794c8211..5171c9971f 100644
--- a/buildconfigs/mk.linux-2.6
+++ b/buildconfigs/mk.linux-2.6
@@ -1,8 +1,6 @@
XEN_LINUX_SOURCE ?= tarball
LINUX_VER ?= 2.6
-XEN_LINUX_TARBALL_KETCHUP := y
-
IMAGE_TARGET ?= vmlinux bzImage
XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
diff --git a/buildconfigs/src.tarball b/buildconfigs/src.tarball
index 176e6cc4f7..c356e4ccf5 100644
--- a/buildconfigs/src.tarball
+++ b/buildconfigs/src.tarball
@@ -1,9 +1,6 @@
XEN_LINUX_MIRROR ?= http://www.kernel.org/pub/linux/kernel/v2.6/
XEN_LINUX_TARBALL ?= linux-$(LINUX_VER)-xen.tar.bz2
-# Update using ketchup instead of manipulating tarball manually.
-XEN_LINUX_TARBALL_KETCHUP ?= n
-
LINUX_SRCDIR ?= linux-$(LINUX_VER)
KETCHUP ?= python buildconfigs/ketchup
@@ -17,17 +14,6 @@ linux-%.tar.bz2:
# XXX create a pristine tree for diff -Nurp convenience
-ifeq ($(XEN_LINUX_TARBALL_KETCHUP),y)
%/.valid-src: $(__XEN_LINUX_UPDATE)
$(KETCHUP) -d $(@D) $(LINUX_VER)
touch $@ # update timestamp to avoid rebuild
-else
-%/.valid-src: $(__XEN_LINUX_UPDATE) %.tar.bz2
- rm -rf tmp-linux-$* $(@D)
- mkdir -p tmp-linux-$*
- tar -C tmp-linux-$* -jxf $<
- -@rm -f tmp-linux-$*/pax_global_header
- mv tmp-linux-$*/* $(@D)
- @rm -rf tmp-linux-$*
- touch $@ # update timestamp to avoid rebuild
-endif