From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Mon, 10 Apr 2006 16:14:15 +0000 (+0100)
Subject: 'make mkpatches' diffs against pristine tree rather than
X-Git-Tag: RELEASE-3.0.2-1~3^2~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1332ba010c1c359c96d23e0c04b4aac2ed63dbe5;p=people%2Fvhanquez%2Fxen.git

'make mkpatches' diffs against pristine tree rather than
ref tree, so it includes extra patches under patches/ subdirectory.

Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index e4cb40def..0a6804bc7 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -124,14 +124,14 @@ linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref
 	rm -rf tmp-$@
 	cp -al $(<D) tmp-$@
 	( cd linux-2.6-xen-sparse && ./mkbuildtree ../tmp-$@ )	
-	diff -Nurp $(<D) tmp-$@ > $@ || true
+	diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true
 	rm -rf tmp-$@
 
 %-xen.patch: ref-%/.valid-ref
 	rm -rf tmp-$@
 	cp -al $(<D) tmp-$@
 	( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )	
-	diff -Nurp $(<D) tmp-$@ > $@ || true
+	diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true
 	rm -rf tmp-$@
 
 %-mrproper: %-mrproper-extra