aboutsummaryrefslogtreecommitdiffstats
path: root/buildconfigs/mk.linux-2.6-xen
diff options
context:
space:
mode:
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>2006-02-02 21:21:47 +0000
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>2006-02-02 21:21:47 +0000
commit31a654dde2789218278229831f1b554f08ccd472 (patch)
tree1cc2a5a5913f685ae24d8fc88946cc8f6d104d1d /buildconfigs/mk.linux-2.6-xen
parent6e59ff5e155de9e39ddf2001a884f19f2857af4c (diff)
downloadxen-31a654dde2789218278229831f1b554f08ccd472.tar.gz
xen-31a654dde2789218278229831f1b554f08ccd472.tar.bz2
xen-31a654dde2789218278229831f1b554f08ccd472.zip
Fix buildsystem.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
Diffstat (limited to 'buildconfigs/mk.linux-2.6-xen')
-rw-r--r--buildconfigs/mk.linux-2.6-xen22
1 files changed, 13 insertions, 9 deletions
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 8cd833bc38..3a44387f22 100644
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -3,6 +3,8 @@ OS = linux
LINUX_SERIES = 2.6
LINUX_VER = 2.6.16-rc1-git4
+LINUX_SRCS = linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 patch-2.6.16-rc1-git4.bz2
+LINUX_PDIR = linux-$(LINUX_VER)
EXTRAVERSION ?= xen
@@ -20,15 +22,17 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
fi
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
-pristine-linux-%/.valid-pristine: override _LINUX_PDIR = linux-$*.16-rc1-git4
-pristine-linux-%.16-rc1-git4/.valid-pristine: linux-%.15.tar.bz2 patch-%.16-rc1.bz2 patch-%.16-rc1-git4.bz2
- rm -rf tmp-pristine-$(_LINUX_PDIR) $(@D)
- mkdir -p tmp-pristine-$(_LINUX_PDIR)
- tar -C tmp-pristine-$(_LINUX_PDIR) -jxf $<
- -@rm tmp-pristine-$(_LINUX_PDIR)/pax_global_header
- mv tmp-pristine-$(_LINUX_PDIR)/* $(@D)
- @rm -rf tmp-pristine-$(_LINUX_PDIR)
- bzcat $(wordlist 2,$(words $^),$^) | patch -d $(@D) -p1
+.valid-srcs: $(LINUX_SRCS)
+ touch $@
+
+pristine-linux-%.16-rc1-git4/.valid-pristine: .valid-srcs
+ rm -rf tmp-pristine-$(LINUX_PDIR) $(@D)
+ mkdir -p tmp-pristine-$(LINUX_PDIR)
+ tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$(LINUX_SRCS))
+ -@rm tmp-pristine-$(LINUX_PDIR)/pax_global_header
+ mv tmp-pristine-$(LINUX_PDIR)/* $(@D)
+ @rm -rf tmp-pristine-$(LINUX_PDIR)
+ bzcat $(wordlist 2,$(words $(LINUX_SRCS)),$(LINUX_SRCS)) | patch -d $(@D) -p1
touch $(@D)/.hgskip
touch $@ # update timestamp to avoid rebuild