aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-10-19 07:43:03 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-10-19 07:43:03 +0100
commit4bdaa2c588c680afaa862f27afa30fa15a377b2d (patch)
tree313bc605510758e1be7db841c70d8f20cebc6d05
parent5e91bc5c8ac6ddb6ff36efe9ab84bcf9047cea5a (diff)
downloadxen-4bdaa2c588c680afaa862f27afa30fa15a377b2d.tar.gz
xen-4bdaa2c588c680afaa862f27afa30fa15a377b2d.tar.bz2
xen-4bdaa2c588c680afaa862f27afa30fa15a377b2d.zip
Rename 2.6.12.5 patch so it actually gets applied. Fail
the build if 'patch' is missing. Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r--buildconfigs/Rules.mk1
-rw-r--r--patches/linux-2.6.12/2.6.12.5.patch (renamed from patches/linux-2.6.12/patch-2.6.12.5)0
2 files changed, 1 insertions, 0 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 19887c5117..2970945810 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -82,6 +82,7 @@ clean::
ref-%/.valid-ref: pristine-%/.valid-pristine
rm -rf $(@D)
cp -al $(<D) $(@D)
+ which patch || exit 1
([ -d patches/$* ] && \
for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done) || true
touch $@ # update timestamp to avoid rebuild
diff --git a/patches/linux-2.6.12/patch-2.6.12.5 b/patches/linux-2.6.12/2.6.12.5.patch
index 5e874eb7b5..5e874eb7b5 100644
--- a/patches/linux-2.6.12/patch-2.6.12.5
+++ b/patches/linux-2.6.12/2.6.12.5.patch