diff options
author | Richard Purdie <richard@openedhand.com> | 2007-04-14 11:07:33 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-04-14 11:07:33 +0000 |
commit | 0443d80b50e98bb329e30430bde5db67f09004e3 (patch) | |
tree | 33d4a5aed54e753a57f69d0e2ad069a0c3c1cd4f /meta | |
parent | 95554ee9b15e575a369d9686be6af45d3a6985fc (diff) | |
download | poky-0443d80b50e98bb329e30430bde5db67f09004e3.tar.gz |
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')
-rw-r--r-- | meta/classes/patch.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index b794f81593..1f10d19f79 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass | |||
@@ -1,5 +1,8 @@ | |||
1 | # Copyright (C) 2006 OpenedHand LTD | 1 | # Copyright (C) 2006 OpenedHand LTD |
2 | 2 | ||
3 | # Point to an empty file so any user's custom settings don't break things | ||
4 | QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" | ||
5 | |||
3 | def patch_init(d): | 6 | def patch_init(d): |
4 | import os, sys | 7 | import os, sys |
5 | 8 | ||
@@ -170,7 +173,8 @@ def patch_init(d): | |||
170 | 173 | ||
171 | class QuiltTree(PatchSet): | 174 | class QuiltTree(PatchSet): |
172 | def _runcmd(self, args): | 175 | def _runcmd(self, args): |
173 | runcmd(["quilt"] + args, self.dir) | 176 | quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1) |
177 | runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir) | ||
174 | 178 | ||
175 | def _quiltpatchpath(self, file): | 179 | def _quiltpatchpath(self, file): |
176 | return os.path.join(self.dir, "patches", os.path.basename(file)) | 180 | return os.path.join(self.dir, "patches", os.path.basename(file)) |