summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/data.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r--bitbake/lib/bb/data.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index ee5557abfa..5d02bab99b 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -369,7 +369,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
369 #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) 369 #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
370 #d.setVarFlag(key, "vardeps", deps) 370 #d.setVarFlag(key, "vardeps", deps)
371 371
372def generate_dependencies(d, whitelist): 372def generate_dependencies(d, ignored_vars):
373 373
374 keys = set(key for key in d if not key.startswith("__")) 374 keys = set(key for key in d if not key.startswith("__"))
375 shelldeps = set(key for key in d.getVar("__exportlist", False) if d.getVarFlag(key, "export", False) and not d.getVarFlag(key, "unexport", False)) 375 shelldeps = set(key for key in d.getVar("__exportlist", False) if d.getVarFlag(key, "export", False) and not d.getVarFlag(key, "unexport", False))
@@ -384,7 +384,7 @@ def generate_dependencies(d, whitelist):
384 newdeps = deps[task] 384 newdeps = deps[task]
385 seen = set() 385 seen = set()
386 while newdeps: 386 while newdeps:
387 nextdeps = newdeps - whitelist 387 nextdeps = newdeps - ignored_vars
388 seen |= nextdeps 388 seen |= nextdeps
389 newdeps = set() 389 newdeps = set()
390 for dep in nextdeps: 390 for dep in nextdeps:
@@ -395,7 +395,7 @@ def generate_dependencies(d, whitelist):
395 #print "For %s: %s" % (task, str(deps[task])) 395 #print "For %s: %s" % (task, str(deps[task]))
396 return tasklist, deps, values 396 return tasklist, deps, values
397 397
398def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn): 398def generate_dependency_hash(tasklist, gendeps, lookupcache, ignored_vars, fn):
399 taskdeps = {} 399 taskdeps = {}
400 basehash = {} 400 basehash = {}
401 401
@@ -408,7 +408,7 @@ def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn):
408 else: 408 else:
409 data = [data] 409 data = [data]
410 410
411 gendeps[task] -= whitelist 411 gendeps[task] -= ignored_vars
412 newdeps = gendeps[task] 412 newdeps = gendeps[task]
413 seen = set() 413 seen = set()
414 while newdeps: 414 while newdeps:
@@ -416,9 +416,9 @@ def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn):
416 seen |= nextdeps 416 seen |= nextdeps
417 newdeps = set() 417 newdeps = set()
418 for dep in nextdeps: 418 for dep in nextdeps:
419 if dep in whitelist: 419 if dep in ignored_vars:
420 continue 420 continue
421 gendeps[dep] -= whitelist 421 gendeps[dep] -= ignored_vars
422 newdeps |= gendeps[dep] 422 newdeps |= gendeps[dep]
423 newdeps -= seen 423 newdeps -= seen
424 424