summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-18 07:55:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-18 15:14:04 +0100
commit5b4e380b9b4335f4607d78d97345bbbda4c66e0e (patch)
treea0130b40e3a61c9a406a56faf4019261c3f8636a /bitbake/lib/bb
parent60d019dde0d2add3f696a99df670696219583c67 (diff)
downloadpoky-5b4e380b9b4335f4607d78d97345bbbda4c66e0e.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/data_smart.py8
1 files changed, 6 insertions, 2 deletions
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):
530 self._setvar_update_overridevars(var, value) 530 self._setvar_update_overridevars(var, value)
531 531
532 def _setvar_update_overridevars(self, var, value): 532 def _setvar_update_overridevars(self, var, value):
533 new = self.expandWithRefs(value, var).references 533 vardata = self.expandWithRefs(value, var)
534 new = vardata.references
535 new.update(vardata.contains.keys())
534 while not new.issubset(self.overridevars): 536 while not new.issubset(self.overridevars):
535 nextnew = set() 537 nextnew = set()
536 self.overridevars.update(new) 538 self.overridevars.update(new)
537 for i in new: 539 for i in new:
538 nextnew.update(self.expandWithRefs(self.getVar(i, True), i).references) 540 vardata = self.expandWithRefs(self.getVar(i, True), i)
541 nextnew.update(vardata.references)
542 nextnew.update(vardata.contains.keys())
539 new = nextnew 543 new = nextnew
540 self.internal_finalize(True) 544 self.internal_finalize(True)
541 545