From 7520e2264892efcd3f544b469cf8821a412ed176 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 9 Jun 2017 15:34:45 +0200 Subject: bitbake: cooker: set config valid flags in initConfigurationData() If we set these flags here then we can not only tidy up some of the code that calls initConfigurationData() (and reset() which simply calls the former), we also avoid calling initConfigurationData() an extra time unnecessarily during startup (since setting baseconfig_valid = False in updateConfigOpts() also resulted in initConfigurationData() being called from updateCacheSync() at the end of the command.) (Bitbake rev: 74d2ef99a920aa9e70470ba8e600ea973a3c672a) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 651b9c0a78..1283136b60 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -213,9 +213,6 @@ class BBCooker: self.configuration.server_register_idlecallback(_process_inotify_updates, [self.confignotifier, self.notifier]) - self.baseconfig_valid = True - self.parsecache_valid = False - # Take a lock so only one copy of bitbake can run against a given build # directory at a time if not self.lockBitbake(): @@ -375,6 +372,8 @@ class BBCooker: self.data.renameVar("__depends", "__base_depends") self.add_filewatch(self.data.getVar("__base_depends", False), self.configwatcher) + self.baseconfig_valid = True + self.parsecache_valid = False def enableDataTracking(self): self.configuration.tracking = True @@ -568,7 +567,6 @@ class BBCooker: clean = False if not clean: logger.debug(1, "Base environment change, triggering reparse") - self.baseconfig_valid = False self.reset() def runCommands(self, server, data, abort): @@ -1623,8 +1621,6 @@ class BBCooker: if not self.baseconfig_valid: logger.debug(1, "Reloading base configuration data") self.initConfigurationData() - self.baseconfig_valid = True - self.parsecache_valid = False # This is called for all async commands when self.state != running def updateCache(self): -- cgit v1.2.3-54-g00ecf