diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-22 22:50:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 22:52:15 +0000 |
commit | 4a1c163b55a399d3a6cb0bedec0ee23ce3128313 (patch) | |
tree | 9de0390c99749aa2ef51d705276afb5f64b24ad6 /bitbake | |
parent | d8b3718303c3d56394c722059f1a73bd79131d0a (diff) | |
download | poky-4a1c163b55a399d3a6cb0bedec0ee23ce3128313.tar.gz |
siggen.py: Pass the datacache to signature generator classes
The dataCache exposes much useful information to the singature generation code
for example its possible to figure out whether kernel dependencies are
important or not based on the RRECOMMENDS values.
We therefore pass this information to the handler and trust it to handle
any API changes in the dataCache structure.
For backwards compatibility, OE-Core is already updated to handle
the extra argument when it appears.
(Bitbake rev: 4ebc25155d5f96a7f63de22b52b18d045eb4dec7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 3a9e132bab..975ae41ac0 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -135,7 +135,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
135 | for task in taskdeps: | 135 | for task in taskdeps: |
136 | d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + "." + task]) | 136 | d.setVar("BB_BASEHASH_task-%s" % task, self.basehash[fn + "." + task]) |
137 | 137 | ||
138 | def rundep_check(self, fn, recipename, task, dep, depname): | 138 | def rundep_check(self, fn, recipename, task, dep, depname, dataCache): |
139 | # Return True if we should keep the dependency, False to drop it | 139 | # Return True if we should keep the dependency, False to drop it |
140 | # We only manipulate the dependencies for packages not in the whitelist | 140 | # We only manipulate the dependencies for packages not in the whitelist |
141 | if self.twl and not self.twl.search(recipename): | 141 | if self.twl and not self.twl.search(recipename): |
@@ -151,7 +151,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
151 | recipename = dataCache.pkg_fn[fn] | 151 | recipename = dataCache.pkg_fn[fn] |
152 | for dep in sorted(deps, key=clean_basepath): | 152 | for dep in sorted(deps, key=clean_basepath): |
153 | depname = dataCache.pkg_fn[self.pkgnameextract.search(dep).group('fn')] | 153 | depname = dataCache.pkg_fn[self.pkgnameextract.search(dep).group('fn')] |
154 | if not self.rundep_check(fn, recipename, task, dep, depname): | 154 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): |
155 | continue | 155 | continue |
156 | if dep not in self.taskhash: | 156 | if dep not in self.taskhash: |
157 | bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep) | 157 | bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep) |