aboutsummaryrefslogtreecommitdiffstats
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:12 +0100
commitda5d1560d4ad1c735f6166a5d9ce94f36c94186b (patch)
treec3dedf0caac6e6316ed5f4dca1c73c823b5cac2c
parentf8a23ad4f8f0336470a5d5b074b7a2d02ec94631 (diff)
downloadbitbake-contrib-da5d1560d4ad1c735f6166a5d9ce94f36c94186b.tar.gz
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 <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index adc41014e..78658a168 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