Always use ketchup for tarball sources, since the only non-user was

the paravirt tree.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/buildconfigs/mk.linux-2.6 b/buildconfigs/mk.linux-2.6
index 07794c8211c1f0f8c9c64a9743c8e208122085b2..5171c9971f03ca0bc73def6ba29b9451a6d2c358 100644 (file)
--- 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 176e6cc4f703a8795876c98f7b0500df6ea27469..c356e4ccf5af42d144b71c7697e7c64f49baa754 100644 (file)
--- 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