[bitbake-devel] [PATCH] data_smart: Ensure OVERRIDES dependencies account for contains()
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Sep 18 07:59:44 UTC 2015
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 09a2adb..ce1f50f 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -540,12 +540,16 @@ class DataSmart(MutableMapping):
self._setvar_update_overridevars(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):
nextnew = set()
self.overridevars.update(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
self.internal_finalize(True)
More information about the bitbake-devel
mailing list