diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-12 15:58:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-21 13:17:12 +0000 |
commit | 850e194f8ce5beeb5226be62ddb7ff839815bd33 (patch) | |
tree | fa42d1608c144a41b703bd3207f327ee0fecd2e0 /lib/bb/siggen.py | |
parent | 92f111a0b2852a3fd5f6a12fe9a890695dece50a (diff) | |
download | bitbake-contrib-850e194f8ce5beeb5226be62ddb7ff839815bd33.tar.gz |
bitbake/siggen.py: Fix whitelisted variable handling
Even when a variable was whitelisted, any dependencies of that variable
could still creep into the task hash due to the way the whitelisting
code worked. This patch changes thing to ensure that when whitelisted,
that whitelisting applies to the variable and any dependencies it has.
(From Poky rev: 25b3d39612c0bea1d136e346d938abde56aa699f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/siggen.py')
-rw-r--r-- | lib/bb/siggen.py | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 6fa122da7..3bd3becc6 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -58,7 +58,7 @@ class SignatureGeneratorBasic(SignatureGenerator): self.runtaskdeps = {} self.gendeps = {} self.lookupcache = {} - self.basewhitelist = (data.getVar("BB_HASHBASE_WHITELIST", True) or "").split() + self.basewhitelist = set((data.getVar("BB_HASHBASE_WHITELIST", True) or "").split()) self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST", True) or None if self.taskwhitelist: @@ -68,17 +68,31 @@ class SignatureGeneratorBasic(SignatureGenerator): def _build_data(self, fn, d): - taskdeps, gendeps = bb.data.generate_dependencies(d) + tasklist, gendeps = bb.data.generate_dependencies(d) + taskdeps = {} basehash = {} lookupcache = {} - for task in taskdeps: + for task in tasklist: data = d.getVar(task, False) lookupcache[task] = data - for dep in sorted(taskdeps[task]): - if dep in self.basewhitelist: - continue + + newdeps = gendeps[task] + seen = set() + while newdeps: + nextdeps = newdeps + seen |= nextdeps + newdeps = set() + for dep in nextdeps: + if dep in self.basewhitelist: + continue + newdeps |= gendeps[dep] + newdeps -= seen + + alldeps = seen - self.basewhitelist + + for dep in sorted(alldeps): if dep in lookupcache: var = lookupcache[dep] else: @@ -89,6 +103,7 @@ class SignatureGeneratorBasic(SignatureGenerator): if data is None: bb.error("Task %s from %s seems to be empty?!" % (task, fn)) self.basehash[fn + "." + task] = hashlib.md5(data).hexdigest() + taskdeps[task] = sorted(alldeps) self.taskdeps[fn] = taskdeps self.gendeps[fn] = gendeps |