ia64/xen-unstable

changeset 16279:34f7017a5941

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

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Tue Oct 30 16:01:07 2007 +0000 (2007-10-30)
parents 4687dc12f1af
children 0c64074794da
files buildconfigs/mk.linux-2.6 buildconfigs/src.tarball
line diff
     1.1 --- a/buildconfigs/mk.linux-2.6	Tue Oct 30 16:01:07 2007 +0000
     1.2 +++ b/buildconfigs/mk.linux-2.6	Tue Oct 30 16:01:07 2007 +0000
     1.3 @@ -1,8 +1,6 @@
     1.4  XEN_LINUX_SOURCE ?= tarball
     1.5  LINUX_VER ?= 2.6
     1.6  
     1.7 -XEN_LINUX_TARBALL_KETCHUP := y
     1.8 -
     1.9  IMAGE_TARGET ?= vmlinux bzImage
    1.10  
    1.11  XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
     2.1 --- a/buildconfigs/src.tarball	Tue Oct 30 16:01:07 2007 +0000
     2.2 +++ b/buildconfigs/src.tarball	Tue Oct 30 16:01:07 2007 +0000
     2.3 @@ -1,9 +1,6 @@
     2.4  XEN_LINUX_MIRROR ?= http://www.kernel.org/pub/linux/kernel/v2.6/
     2.5  XEN_LINUX_TARBALL ?= linux-$(LINUX_VER)-xen.tar.bz2
     2.6  
     2.7 -# Update using ketchup instead of manipulating tarball manually.
     2.8 -XEN_LINUX_TARBALL_KETCHUP ?= n
     2.9 -
    2.10  LINUX_SRCDIR ?= linux-$(LINUX_VER)
    2.11  
    2.12  KETCHUP ?= python buildconfigs/ketchup
    2.13 @@ -17,17 +14,6 @@ linux-%.tar.bz2:
    2.14  
    2.15  # XXX create a pristine tree for diff -Nurp convenience
    2.16  
    2.17 -ifeq ($(XEN_LINUX_TARBALL_KETCHUP),y)
    2.18  %/.valid-src: $(__XEN_LINUX_UPDATE)
    2.19  	$(KETCHUP) -d $(@D) $(LINUX_VER)
    2.20  	touch $@ # update timestamp to avoid rebuild
    2.21 -else
    2.22 -%/.valid-src: $(__XEN_LINUX_UPDATE) %.tar.bz2
    2.23 -	rm -rf tmp-linux-$* $(@D)
    2.24 -	mkdir -p tmp-linux-$*
    2.25 -	tar -C tmp-linux-$* -jxf $<
    2.26 -	-@rm -f tmp-linux-$*/pax_global_header
    2.27 -	mv tmp-linux-$*/* $(@D)
    2.28 -	@rm -rf tmp-linux-$*
    2.29 -	touch $@ # update timestamp to avoid rebuild
    2.30 -endif