summaryrefslogtreecommitdiff
path: root/meta/classes/patch.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-04-14 11:07:33 +0000
committerRichard Purdie <richard@openedhand.com>2007-04-14 11:07:33 +0000
commit0443d80b50e98bb329e30430bde5db67f09004e3 (patch)
tree33d4a5aed54e753a57f69d0e2ad069a0c3c1cd4f /meta/classes/patch.bbclass
parent95554ee9b15e575a369d9686be6af45d3a6985fc (diff)
downloadopenembedded-core-0443d80b50e98bb329e30430bde5db67f09004e3.tar.gz
openembedded-core-0443d80b50e98bb329e30430bde5db67f09004e3.tar.bz2
openembedded-core-0443d80b50e98bb329e30430bde5db67f09004e3.tar.xz
openembedded-core-0443d80b50e98bb329e30430bde5db67f09004e3.zip
patch.bbclass: Specify a quiltrc file so users settings don't interfere with correct operation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1509 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/patch.bbclass')
-rw-r--r--meta/classes/patch.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index b794f8159..1f10d19f7 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -1,5 +1,8 @@
# Copyright (C) 2006 OpenedHand LTD
+# Point to an empty file so any user's custom settings don't break things
+QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
+
def patch_init(d):
import os, sys
@@ -170,7 +173,8 @@ def patch_init(d):
class QuiltTree(PatchSet):
def _runcmd(self, args):
- runcmd(["quilt"] + args, self.dir)
+ quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1)
+ runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
def _quiltpatchpath(self, file):
return os.path.join(self.dir, "patches", os.path.basename(file))