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:26 +0100
commitd6462e014989db9536691d7f2fdda01d0d0a8526 (patch)
tree3365cb229603d9d33e3c8bd1f1860ce69c5d030c /bitbake
parent38a6b64f1c3090e7f1ef17f56f4b7f24aa8a92f4 (diff)
downloadpoky-d6462e014989db9536691d7f2fdda01d0d0a8526.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: 2ea1e6720c66841baa5e01c523c86f8ecb03eb7d) 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 5bb7de9437..8dac7934f7 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