summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-05-22 08:35:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-11 13:28:21 +0100
commita358cc20104a554d1336fdb80bf39fe8603527ef (patch)
tree46f634cb79c0ebb2d8c553cb192ef625fac25a04 /bitbake
parent14040a2613169639faeb9962fcc0521ca425f70f (diff)
downloadpoky-a358cc20104a554d1336fdb80bf39fe8603527ef.tar.gz
bitbake: bitbake: cooker: Rename __depends in all multiconfigs
The renaming of the __depends variable to __base_depends and file watches needs to occurs for all multiconfigs, not just the base config. Failing to do this for all multiconfigs will result in a huge increase in the size of the parsing cache (about 5x for a single mulitconfig) because all multiconfig caches will still depend on the base config files. This will also seen a similar jump in the amount of time required to load the parsing cache from memory, both because the cache is larger and because of explosion of additional existence checks that must be done for the base files. [YOCTO #13359] (Bitbake rev: da5d1560d4ad1c735f6166a5d9ce94f36c94186b) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index adc41014e6..78658a1683 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -391,8 +391,9 @@ class BBCooker:
391 if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: 391 if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
392 self.disableDataTracking() 392 self.disableDataTracking()
393 393
394 self.data.renameVar("__depends", "__base_depends") 394 for mc in self.databuilder.mcdata.values():
395 self.add_filewatch(self.data.getVar("__base_depends", False), self.configwatcher) 395 mc.renameVar("__depends", "__base_depends")
396 self.add_filewatch(mc.getVar("__base_depends", False), self.configwatcher)
396 397
397 self.baseconfig_valid = True 398 self.baseconfig_valid = True
398 self.parsecache_valid = False 399 self.parsecache_valid = False