bitbake: data_smart: Account for changes in append/prepend/remove in the config hash
bitbake wasn't reparsing when _remove items were added to its configuration and equally, appends/prepends were also being badly tracked. This change enrures these variables are accounted for in the configuration hash. [YOCTO #5172] (Bitbake rev: 62914f9208ef2427a34daa523af857f4027900eb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
89ca97371d
commit
dd36930f3f
|
@ -635,13 +635,13 @@ class DataSmart(MutableMapping):
|
||||||
self.varhistory.record(**loginfo)
|
self.varhistory.record(**loginfo)
|
||||||
self.dict[var][i] = flags[i]
|
self.dict[var][i] = flags[i]
|
||||||
|
|
||||||
def getVarFlags(self, var):
|
def getVarFlags(self, var, internalflags=False):
|
||||||
local_var = self._findVar(var)
|
local_var = self._findVar(var)
|
||||||
flags = {}
|
flags = {}
|
||||||
|
|
||||||
if local_var:
|
if local_var:
|
||||||
for i in local_var:
|
for i in local_var:
|
||||||
if i.startswith("_"):
|
if i.startswith("_") and not internalflags:
|
||||||
continue
|
continue
|
||||||
flags[i] = local_var[i]
|
flags[i] = local_var[i]
|
||||||
|
|
||||||
|
@ -750,13 +750,16 @@ class DataSmart(MutableMapping):
|
||||||
for key in keys:
|
for key in keys:
|
||||||
if key in config_whitelist:
|
if key in config_whitelist:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
value = d.getVar(key, False) or ""
|
value = d.getVar(key, False) or ""
|
||||||
data.update({key:value})
|
data.update({key:value})
|
||||||
|
|
||||||
varflags = d.getVarFlags(key)
|
varflags = d.getVarFlags(key, internalflags = True)
|
||||||
if not varflags:
|
if not varflags:
|
||||||
continue
|
continue
|
||||||
for f in varflags:
|
for f in varflags:
|
||||||
|
if f == "_content":
|
||||||
|
continue
|
||||||
data.update({'%s[%s]' % (key, f):varflags[f]})
|
data.update({'%s[%s]' % (key, f):varflags[f]})
|
||||||
|
|
||||||
for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]:
|
for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]:
|
||||||
|
|
Loading…
Reference in New Issue