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/data.py | |
| parent | 92f111a0b2852a3fd5f6a12fe9a890695dece50a (diff) | |
| download | bitbake-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/data.py')
| -rw-r--r-- | lib/bb/data.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index 8e7031e34..50cba4629 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -308,12 +308,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: @@ -325,9 +323,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 [] |