summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/data.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-12 15:58:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-12 15:58:48 +0000
commit25b3d39612c0bea1d136e346d938abde56aa699f (patch)
tree55c4218de429a3e5f861734b1d2966a4fb360dff /bitbake/lib/bb/data.py
parent041adc97125189d1d91ecc7de16ff0e3e386e15b (diff)
downloadpoky-25b3d39612c0bea1d136e346d938abde56aa699f.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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r--bitbake/lib/bb/data.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 198b628fad..50f2218a70 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -313,12 +313,10 @@ def generate_dependencies(d):
313 shelldeps = set(key for key in keys if d.getVarFlag(key, "export") and not d.getVarFlag(key, "unexport")) 313 shelldeps = set(key for key in keys if d.getVarFlag(key, "export") and not d.getVarFlag(key, "unexport"))
314 314
315 deps = {} 315 deps = {}
316 taskdeps = {}
317 316
318 tasklist = bb.data.getVar('__BBTASKS', d) or [] 317 tasklist = bb.data.getVar('__BBTASKS', d) or []
319 for task in tasklist: 318 for task in tasklist:
320 deps[task] = build_dependencies(task, keys, shelldeps, d) 319 deps[task] = build_dependencies(task, keys, shelldeps, d)
321
322 newdeps = deps[task] 320 newdeps = deps[task]
323 seen = set() 321 seen = set()
324 while newdeps: 322 while newdeps:
@@ -330,9 +328,8 @@ def generate_dependencies(d):
330 deps[dep] = build_dependencies(dep, keys, shelldeps, d) 328 deps[dep] = build_dependencies(dep, keys, shelldeps, d)
331 newdeps |= deps[dep] 329 newdeps |= deps[dep]
332 newdeps -= seen 330 newdeps -= seen
333 taskdeps[task] = seen | newdeps
334 #print "For %s: %s" % (task, str(taskdeps[task])) 331 #print "For %s: %s" % (task, str(taskdeps[task]))
335 return taskdeps, deps 332 return tasklist, deps
336 333
337def inherits_class(klass, d): 334def inherits_class(klass, d):
338 val = getVar('__inherit_cache', d) or [] 335 val = getVar('__inherit_cache', d) or []