summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-02-12 15:27:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 12:12:36 +0000
commit95e7dae968d83e7fa793dd72444e60338b801ecd (patch)
tree124cad2e84daa954cc4856a080e2c1b39fb3ac2c /bitbake
parentd5ef2e5cc04bea534dd132b5fd40efe78ddcfc4f (diff)
downloadpoky-95e7dae968d83e7fa793dd72444e60338b801ecd.tar.gz
poky-95e7dae968d83e7fa793dd72444e60338b801ecd.tar.bz2
poky-95e7dae968d83e7fa793dd72444e60338b801ecd.zip
bitbake: bitbake & hob: reparse config files, when sanity check updates bblayers.conf
I've sent a patch to poky, with some changes in sanity.bbclass. When bblayers.conf is updated, it updates also a variable to know when to reparse configuration files. This patch contains the changes to reparse conf files, after a sanity check which changes bblayers.conf. [YOCTO #3213] (Bitbake rev: 966e3e59ceb1c8b33b5881f291c148ea6513eda0) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py14
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py4
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:
bb.fetch.fetcher_init(data)
bb.codeparser.parser_cache_init(data)
bb.event.fire(bb.event.ConfigParsed(), data)
- bb.parse.init_parser(data)
- data.setVar('BBINCLUDED',bb.parse.get_file_depends(data))
- self.configuration.data = data
- self.configuration.data_hash = data.get_hash()
+
+ if data.getVar("BB_INVALIDCONF") is True:
+ data.setVar("BB_INVALIDCONF", False)
+ self.parseConfigurationFiles(self.configuration.prefile,
+ self.configuration.postfile)
+ else:
+ bb.parse.init_parser(data)
+ data.setVar('BBINCLUDED',bb.parse.get_file_depends(data))
+ self.configuration.data = data
+ self.configuration.data_hash = data.get_hash()
def handleCollections( self, collections ):
"""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):
self.run_next_command()
elif isinstance(event, bb.event.SanityCheckPassed):
+ reparse = self.runCommand(["getVariable", "BB_INVALIDCONF"]) or None
+ if reparse is True:
+ self.runCommand(["setVariable", "BB_INVALIDCONF", False])
+ self.runCommand(["parseConfigurationFiles", "", ""])
self.run_next_command()
elif isinstance(event, bb.event.SanityCheckFailed):