From 5b4e380b9b4335f4607d78d97345bbbda4c66e0e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Sep 2015 07:55:47 +0000 Subject: 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 --- bitbake/lib/bb/data_smart.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/data_smart.py') diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 51cf813053..70558c15aa 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -530,12 +530,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) -- cgit v1.2.3-54-g00ecf