diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 14 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index f70a04f460..9d051fa30f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -977,10 +977,16 @@ class BBCooker: | |||
977 | bb.fetch.fetcher_init(data) | 977 | bb.fetch.fetcher_init(data) |
978 | bb.codeparser.parser_cache_init(data) | 978 | bb.codeparser.parser_cache_init(data) |
979 | bb.event.fire(bb.event.ConfigParsed(), data) | 979 | bb.event.fire(bb.event.ConfigParsed(), data) |
980 | bb.parse.init_parser(data) | 980 | |
981 | data.setVar('BBINCLUDED',bb.parse.get_file_depends(data)) | 981 | if data.getVar("BB_INVALIDCONF") is True: |
982 | self.configuration.data = data | 982 | data.setVar("BB_INVALIDCONF", False) |
983 | self.configuration.data_hash = data.get_hash() | 983 | self.parseConfigurationFiles(self.configuration.prefile, |
984 | self.configuration.postfile) | ||
985 | else: | ||
986 | bb.parse.init_parser(data) | ||
987 | data.setVar('BBINCLUDED',bb.parse.get_file_depends(data)) | ||
988 | self.configuration.data = data | ||
989 | self.configuration.data_hash = data.get_hash() | ||
984 | 990 | ||
985 | def handleCollections( self, collections ): | 991 | def handleCollections( self, collections ): |
986 | """Handle collections""" | 992 | """Handle collections""" |
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index d953f3497c..15d28d927a 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -202,6 +202,10 @@ class HobHandler(gobject.GObject): | |||
202 | self.run_next_command() | 202 | self.run_next_command() |
203 | 203 | ||
204 | elif isinstance(event, bb.event.SanityCheckPassed): | 204 | elif isinstance(event, bb.event.SanityCheckPassed): |
205 | reparse = self.runCommand(["getVariable", "BB_INVALIDCONF"]) or None | ||
206 | if reparse is True: | ||
207 | self.runCommand(["setVariable", "BB_INVALIDCONF", False]) | ||
208 | self.runCommand(["parseConfigurationFiles", "", ""]) | ||
205 | self.run_next_command() | 209 | self.run_next_command() |
206 | 210 | ||
207 | elif isinstance(event, bb.event.SanityCheckFailed): | 211 | elif isinstance(event, bb.event.SanityCheckFailed): |