From 25b3d39612c0bea1d136e346d938abde56aa699f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 12 Jan 2011 15:58:48 +0000 Subject: 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 --- bitbake/lib/bb/data.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bitbake/lib/bb/data.py') 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): shelldeps = set(key for key in keys if d.getVarFlag(key, "export") and not d.getVarFlag(key, "unexport")) deps = {} - taskdeps = {} tasklist = bb.data.getVar('__BBTASKS', d) or [] for task in tasklist: deps[task] = build_dependencies(task, keys, shelldeps, d) - newdeps = deps[task] seen = set() while newdeps: @@ -330,9 +328,8 @@ def generate_dependencies(d): deps[dep] = build_dependencies(dep, keys, shelldeps, d) newdeps |= deps[dep] newdeps -= seen - taskdeps[task] = seen | newdeps #print "For %s: %s" % (task, str(taskdeps[task])) - return taskdeps, deps + return tasklist, deps def inherits_class(klass, d): val = getVar('__inherit_cache', d) or [] -- cgit v1.2.3-54-g00ecf