diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-03 14:32:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-03 14:32:53 +0000 |
| commit | 31af90140f95e186bc2f5a53f725429abaa8df57 (patch) | |
| tree | 256db50de502a050b810c9badad14b397652c0db /classes | |
| parent | 7df34642f9d073cf00bb743b50583cfe204232d0 (diff) | |
patch.bbclass: give empty file for quilt so it will not use config from user homedir - closes #2704 (code from Poky)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/patch.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 2ba6729af8..0cc202820f 100644 --- a/classes/patch.bbclass +++ b/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 @@ -180,9 +183,10 @@ def patch_init(d): class QuiltTree(PatchSet): def _runcmd(self, args, run = True): + quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1) if not run: - return ["quilt"] + args - runcmd(["quilt"] + args, self.dir) + return ["quilt"] + ["--quiltrc"] + [quiltrc] + args + runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir) def _quiltpatchpath(self, file): return os.path.join(self.dir, "patches", os.path.basename(file)) |