From 2ea1e6720c66841baa5e01c523c86f8ecb03eb7d Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 22 May 2019 08:35:03 -0500 Subject: 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] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 5bb7de943..8dac7934f 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -391,8 +391,9 @@ class BBCooker: if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: self.disableDataTracking() - self.data.renameVar("__depends", "__base_depends") - self.add_filewatch(self.data.getVar("__base_depends", False), self.configwatcher) + for mc in self.databuilder.mcdata.values(): + mc.renameVar("__depends", "__base_depends") + self.add_filewatch(mc.getVar("__base_depends", False), self.configwatcher) self.baseconfig_valid = True self.parsecache_valid = False -- cgit 1.2.3-korg