[oe-commits] [bitbake] 02/02: bitbake: cooker: Rename __depends in all multiconfigs

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.42
in repository bitbake.

commit 2ea1e6720c66841baa5e01c523c86f8ecb03eb7d
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Wed May 22 08:35:03 2019 -0500

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 5bb7de9..8dac793 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.