ia64/xen-unstable

changeset 8748:6b14b81dc5a8

Fix another corner case in the build system.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Fri Feb 03 09:54:04 2006 +0000 (2006-02-03)
parents 959ba341631c
children aeaa1f0dedd8
files .hgignore buildconfigs/mk.linux-2.6-xen
line diff
     1.1 --- a/.hgignore	Fri Feb 03 09:37:34 2006 +0000
     1.2 +++ b/.hgignore	Fri Feb 03 09:54:04 2006 +0000
     1.3 @@ -14,7 +14,6 @@
     1.4  .*\.orig$
     1.5  .*\.rej$
     1.6  ^[^/]*\.bz2$
     1.7 -^\.valid-srcs$
     1.8  ^TAGS$
     1.9  ^dist/.*$
    1.10  ^docs/.*\.aux$
    1.11 @@ -68,6 +67,7 @@
    1.12  ^patches/tmp/.*$
    1.13  ^pristine-.*$
    1.14  ^ref-.*$
    1.15 +^tmp-.*$
    1.16  ^tools/.*/TAGS$
    1.17  ^tools/.*/build/lib.*/.*\.py$
    1.18  ^tools/blktap/Makefile\.smh$
     2.1 --- a/buildconfigs/mk.linux-2.6-xen	Fri Feb 03 09:37:34 2006 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.6-xen	Fri Feb 03 09:54:04 2006 +0000
     2.3 @@ -22,18 +22,18 @@ build: $(LINUX_DIR)/include/linux/autoco
     2.4  	fi
     2.5  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
     2.6  
     2.7 -.valid-srcs: $(LINUX_SRCS)
     2.8 -	touch $@
     2.9 -
    2.10 -pristine-linux-%.16-rc1-git4/.valid-pristine: .valid-srcs
    2.11 +pristine-$(LINUX_PDIR)/.valid-srcs: $(LINUX_SRCS)
    2.12  	rm -rf tmp-pristine-$(LINUX_PDIR) $(@D)
    2.13  	mkdir -p tmp-pristine-$(LINUX_PDIR)
    2.14 -	tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$(LINUX_SRCS))
    2.15 +	tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$<)
    2.16  	-@rm tmp-pristine-$(LINUX_PDIR)/pax_global_header
    2.17  	mv tmp-pristine-$(LINUX_PDIR)/* $(@D)
    2.18  	@rm -rf tmp-pristine-$(LINUX_PDIR)
    2.19 -	bzcat $(wordlist 2,$(words $(LINUX_SRCS)),$(LINUX_SRCS)) | patch -d $(@D) -p1
    2.20 +	bzcat $(wordlist 2,$(words $<),$<) | patch -d $(@D) -p1
    2.21  	touch $(@D)/.hgskip
    2.22 +	touch $@
    2.23 +
    2.24 +pristine-linux-%.16-rc1-git4/.valid-pristine: pristine-$(LINUX_PDIR)/.valid-srcs
    2.25  	touch $@ # update timestamp to avoid rebuild
    2.26  
    2.27  $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref