summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-05-22 08:35:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-30 12:37:03 +0100
commit66fd4c13d97a23338f6cdde6770ffb0e60f0b814 (patch)
tree0bd8adbe9f604d371bd99cd130a61362635ef0dd
parent01543538d1139ab4244760f254b4c5289a50a4ea (diff)
downloadpoky-66fd4c13d97a23338f6cdde6770ffb0e60f0b814.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: 34137a00f60280e9e806070c6507a0fc6284b834) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 c8e14042d6..33697a71d5 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -378,8 +378,9 @@ class BBCooker:
378 if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: 378 if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
379 self.disableDataTracking() 379 self.disableDataTracking()
380 380
381 self.data.renameVar("__depends", "__base_depends") 381 for mc in self.databuilder.mcdata.values():
382 self.add_filewatch(self.data.getVar("__base_depends", False), self.configwatcher) 382 mc.renameVar("__depends", "__base_depends")
383 self.add_filewatch(mc.getVar("__base_depends", False), self.configwatcher)
383 384
384 self.baseconfig_valid = True 385 self.baseconfig_valid = True
385 self.parsecache_valid = False 386 self.parsecache_valid = False