aboutsummaryrefslogtreecommitdiffstats
path: root/buildconfigs/Rules.mk
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-04-10 13:24:58 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-04-10 13:24:58 +0100
commit5dfbb5affbd3e7ba8fd8493da4325d33915465d8 (patch)
tree1582d53dc3ead5dd649b1c0cb77e62247bc2413e /buildconfigs/Rules.mk
parentd033b064ca456423fc0c55822497aa9354f6ecd8 (diff)
downloadxen-5dfbb5affbd3e7ba8fd8493da4325d33915465d8.tar.gz
xen-5dfbb5affbd3e7ba8fd8493da4325d33915465d8.tar.bz2
xen-5dfbb5affbd3e7ba8fd8493da4325d33915465d8.zip
'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>
Diffstat (limited to 'buildconfigs/Rules.mk')
-rw-r--r--buildconfigs/Rules.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index e4cb40def8..0a6804bc7e 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