bitbake: data_smart: Ensure OVERRIDES dependencies account for contains()
The dependencies of OVERRIDES were not including DEFAULTTUNE in OE-Core. This is pulled in by a bb.utils.contains() reference which the override dependency tracking code wasn't accounting for. This patch ensures we do track contains references too. (Bitbake rev: f3ee534cb0560dbb5f88a0ffe01e9305bae102e1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
60d019dde0
commit
5b4e380b9b
|
@ -530,12 +530,16 @@ class DataSmart(MutableMapping):
|
||||||
self._setvar_update_overridevars(var, value)
|
self._setvar_update_overridevars(var, value)
|
||||||
|
|
||||||
def _setvar_update_overridevars(self, var, value):
|
def _setvar_update_overridevars(self, var, value):
|
||||||
new = self.expandWithRefs(value, var).references
|
vardata = self.expandWithRefs(value, var)
|
||||||
|
new = vardata.references
|
||||||
|
new.update(vardata.contains.keys())
|
||||||
while not new.issubset(self.overridevars):
|
while not new.issubset(self.overridevars):
|
||||||
nextnew = set()
|
nextnew = set()
|
||||||
self.overridevars.update(new)
|
self.overridevars.update(new)
|
||||||
for i in new:
|
for i in new:
|
||||||
nextnew.update(self.expandWithRefs(self.getVar(i, True), i).references)
|
vardata = self.expandWithRefs(self.getVar(i, True), i)
|
||||||
|
nextnew.update(vardata.references)
|
||||||
|
nextnew.update(vardata.contains.keys())
|
||||||
new = nextnew
|
new = nextnew
|
||||||
self.internal_finalize(True)
|
self.internal_finalize(True)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue