summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-30 17:22:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-01 21:45:57 +0100
commit642197f7a42e51517a68cd3078146ee8acce44c4 (patch)
treefa23773326a5703564201619ed5b740473ce00f7 /bitbake
parentbe873a02ab38a2b09fc6c7e53242aadf872bce94 (diff)
downloadpoky-642197f7a42e51517a68cd3078146ee8acce44c4.tar.gz
bitbake: data: Fix handling of vardepvalueexclude
The value used for exclusion was always being expanded. This is actually a bad idea since in most cases you'd want to exclude an unexpanded value and makes it impossible to use the variable as intended. This adjusts things so the value is not expanded and we can correctly remove things from checksums much more easily. (Bitbake rev: 81bc8201c475d2b6bef0168573915ad0140f6dad) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 48d990dd16..c1f27cd0c3 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -339,7 +339,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
339 deps |= parser.references 339 deps |= parser.references
340 deps = deps | (keys & parser.execs) 340 deps = deps | (keys & parser.execs)
341 return deps, value 341 return deps, value
342 varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "vardepvalueexclude", "exports", "postfuncs", "prefuncs", "lineno", "filename"]) or {} 342 varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "exports", "postfuncs", "prefuncs", "lineno", "filename"]) or {}
343 vardeps = varflags.get("vardeps") 343 vardeps = varflags.get("vardeps")
344 value = d.getVar(key, False) 344 value = d.getVar(key, False)
345 345