diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-06-09 15:34:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 15:07:39 +0100 |
commit | 7520e2264892efcd3f544b469cf8821a412ed176 (patch) | |
tree | 7c702525c278227d46ec6e990ae28a300e8f4b48 /bitbake/lib/bb/cooker.py | |
parent | 67f676f70449273f0f3e686d0c88999e482cc964 (diff) | |
download | poky-7520e2264892efcd3f544b469cf8821a412ed176.tar.gz |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 8 |
1 files changed, 2 insertions, 6 deletions
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: | |||
213 | 213 | ||
214 | self.configuration.server_register_idlecallback(_process_inotify_updates, [self.confignotifier, self.notifier]) | 214 | self.configuration.server_register_idlecallback(_process_inotify_updates, [self.confignotifier, self.notifier]) |
215 | 215 | ||
216 | self.baseconfig_valid = True | ||
217 | self.parsecache_valid = False | ||
218 | |||
219 | # Take a lock so only one copy of bitbake can run against a given build | 216 | # Take a lock so only one copy of bitbake can run against a given build |
220 | # directory at a time | 217 | # directory at a time |
221 | if not self.lockBitbake(): | 218 | if not self.lockBitbake(): |
@@ -375,6 +372,8 @@ class BBCooker: | |||
375 | self.data.renameVar("__depends", "__base_depends") | 372 | self.data.renameVar("__depends", "__base_depends") |
376 | self.add_filewatch(self.data.getVar("__base_depends", False), self.configwatcher) | 373 | self.add_filewatch(self.data.getVar("__base_depends", False), self.configwatcher) |
377 | 374 | ||
375 | self.baseconfig_valid = True | ||
376 | self.parsecache_valid = False | ||
378 | 377 | ||
379 | def enableDataTracking(self): | 378 | def enableDataTracking(self): |
380 | self.configuration.tracking = True | 379 | self.configuration.tracking = True |
@@ -568,7 +567,6 @@ class BBCooker: | |||
568 | clean = False | 567 | clean = False |
569 | if not clean: | 568 | if not clean: |
570 | logger.debug(1, "Base environment change, triggering reparse") | 569 | logger.debug(1, "Base environment change, triggering reparse") |
571 | self.baseconfig_valid = False | ||
572 | self.reset() | 570 | self.reset() |
573 | 571 | ||
574 | def runCommands(self, server, data, abort): | 572 | def runCommands(self, server, data, abort): |
@@ -1623,8 +1621,6 @@ class BBCooker: | |||
1623 | if not self.baseconfig_valid: | 1621 | if not self.baseconfig_valid: |
1624 | logger.debug(1, "Reloading base configuration data") | 1622 | logger.debug(1, "Reloading base configuration data") |
1625 | self.initConfigurationData() | 1623 | self.initConfigurationData() |
1626 | self.baseconfig_valid = True | ||
1627 | self.parsecache_valid = False | ||
1628 | 1624 | ||
1629 | # This is called for all async commands when self.state != running | 1625 | # This is called for all async commands when self.state != running |
1630 | def updateCache(self): | 1626 | def updateCache(self): |