From 8a16bf5321a51f440b9b5dcc29bc498d1eb0bf28 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 13 Feb 2022 16:54:25 -0500 Subject: bitbake: bitbake: Rename basehas and taskhash filtering variables In line with the inclusive language migration defined at: https://wiki.yoctoproject.org/wiki/Inclusive_language rename: BB_HASHBASE_WHITELIST -> BB_BASEHASH_IGNORE_VARS BB_HASHTASK_WHITELIST -> BB_TASKHASH_IGNORE_TASKS the derived code variables basewhitelist and taskwhitelist have been renamed to basehash_ignore_vars and taskhash_ignore_tasks, respectively. [RP: Added compatibility mapping code and tweaked naming] (Bitbake rev: efaafc9ec2e8c0475e3fb27e877a1c0a5532a0e5) Signed-off-by: Scott Murray Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/data.py') 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): #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) #d.setVarFlag(key, "vardeps", deps) -def generate_dependencies(d, whitelist): +def generate_dependencies(d, ignored_vars): keys = set(key for key in d if not key.startswith("__")) 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): newdeps = deps[task] seen = set() while newdeps: - nextdeps = newdeps - whitelist + nextdeps = newdeps - ignored_vars seen |= nextdeps newdeps = set() for dep in nextdeps: @@ -395,7 +395,7 @@ def generate_dependencies(d, whitelist): #print "For %s: %s" % (task, str(deps[task])) return tasklist, deps, values -def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn): +def generate_dependency_hash(tasklist, gendeps, lookupcache, ignored_vars, fn): taskdeps = {} basehash = {} @@ -408,7 +408,7 @@ def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn): else: data = [data] - gendeps[task] -= whitelist + gendeps[task] -= ignored_vars newdeps = gendeps[task] seen = set() while newdeps: @@ -416,9 +416,9 @@ def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn): seen |= nextdeps newdeps = set() for dep in nextdeps: - if dep in whitelist: + if dep in ignored_vars: continue - gendeps[dep] -= whitelist + gendeps[dep] -= ignored_vars newdeps |= gendeps[dep] newdeps -= seen -- cgit v1.2.3-54-g00ecf