[bitbake-devel] [PATCH] cookerdata: Simplify prefiles/postfiles
Richard Purdie
richard.purdie at linuxfoundation.org
Mon Aug 15 16:57:20 UTC 2016
The current codepaths are rather confusing. Stop passing these
as parameters and use the ones from when the object is created.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index dc34efe..71021a3 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -258,7 +258,7 @@ class CookerDataBuilder(object):
def parseBaseConfiguration(self):
try:
- self.parseConfigurationFiles(self.prefiles, self.postfiles)
+ self.parseConfigurationFiles()
except SyntaxError:
raise bb.BBHandledException
except bb.data_smart.ExpansionError as e:
@@ -271,8 +271,10 @@ class CookerDataBuilder(object):
def _findLayerConf(self, data):
return findConfigFile("bblayers.conf", data)
- def parseConfigurationFiles(self, prefiles, postfiles):
+ def parseConfigurationFiles(self):
data = self.data
+ prefiles = self.prefiles
+ postfiles = self.postfiles
bb.parse.init_parser(data)
# Parse files for loading *before* bitbake.conf and any includes
@@ -343,7 +345,7 @@ class CookerDataBuilder(object):
if data.getVar("BB_INVALIDCONF", False) is True:
data.setVar("BB_INVALIDCONF", False)
- self.parseConfigurationFiles(self.prefiles, self.postfiles)
+ self.parseConfigurationFiles()
return
bb.parse.init_parser(data)
More information about the bitbake-devel
mailing list