From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 30 Sep 2016 16:22:12 +0000 (+0100)
Subject: bitbake: data: Fix handling of vardepvalueexclude
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=642197f7a42e51517a68cd3078146ee8acce44c4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 48d990dd161..c1f27cd0c30 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):
             deps |= parser.references
             deps = deps | (keys & parser.execs)
             return deps, value
-        varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "vardepvalueexclude", "exports", "postfuncs", "prefuncs", "lineno", "filename"]) or {}
+        varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "exports", "postfuncs", "prefuncs", "lineno", "filename"]) or {}
         vardeps = varflags.get("vardeps")
         value = d.getVar(key, False)