[Xen-changelog] Fix another corner case in the build system.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 6b14b81dc5a8aba85472573f23dedfcbfcdf2f2b
# Parent  959ba341631c34024299f5773f13641b53270402
Fix another corner case in the build system.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 959ba341631c -r 6b14b81dc5a8 .hgignore
--- a/.hgignore Fri Feb  3 09:37:34 2006
+++ b/.hgignore Fri Feb  3 09:54:04 2006
@@ -14,7 +14,6 @@
 .*\.orig$
 .*\.rej$
 ^[^/]*\.bz2$
-^\.valid-srcs$
 ^TAGS$
 ^dist/.*$
 ^docs/.*\.aux$
@@ -68,6 +67,7 @@
 ^patches/tmp/.*$
 ^pristine-.*$
 ^ref-.*$
+^tmp-.*$
 ^tools/.*/TAGS$
 ^tools/.*/build/lib.*/.*\.py$
 ^tools/blktap/Makefile\.smh$
diff -r 959ba341631c -r 6b14b81dc5a8 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen     Fri Feb  3 09:37:34 2006
+++ b/buildconfigs/mk.linux-2.6-xen     Fri Feb  3 09:54:04 2006
@@ -22,18 +22,18 @@
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) 
install
 
-.valid-srcs: $(LINUX_SRCS)
-       touch $@
-
-pristine-linux-%.16-rc1-git4/.valid-pristine: .valid-srcs
+pristine-$(LINUX_PDIR)/.valid-srcs: $(LINUX_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))
+       tar -C tmp-pristine-$(LINUX_PDIR) -jxf $(word 1,$<)
        -@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
+       bzcat $(wordlist 2,$(words $<),$<) | patch -d $(@D) -p1
        touch $(@D)/.hgskip
+       touch $@
+
+pristine-linux-%.16-rc1-git4/.valid-pristine: 
pristine-$(LINUX_PDIR)/.valid-srcs
        touch $@ # update timestamp to avoid rebuild
 
 $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog