bitbake: cookerdata: Simplify prefiles/postfiles
The current codepaths are rather confusing. Stop passing these as parameters and use the ones from when the object is created. (Bitbake rev: 8c992c148d9619b10eeae8bbd9376ecf408037a5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3be73dcd7a
commit
249686927b
|
@ -258,7 +258,7 @@ class CookerDataBuilder(object):
|
||||||
|
|
||||||
def parseBaseConfiguration(self):
|
def parseBaseConfiguration(self):
|
||||||
try:
|
try:
|
||||||
self.parseConfigurationFiles(self.prefiles, self.postfiles)
|
self.parseConfigurationFiles()
|
||||||
except SyntaxError:
|
except SyntaxError:
|
||||||
raise bb.BBHandledException
|
raise bb.BBHandledException
|
||||||
except bb.data_smart.ExpansionError as e:
|
except bb.data_smart.ExpansionError as e:
|
||||||
|
@ -271,8 +271,10 @@ class CookerDataBuilder(object):
|
||||||
def _findLayerConf(self, data):
|
def _findLayerConf(self, data):
|
||||||
return findConfigFile("bblayers.conf", data)
|
return findConfigFile("bblayers.conf", data)
|
||||||
|
|
||||||
def parseConfigurationFiles(self, prefiles, postfiles):
|
def parseConfigurationFiles(self):
|
||||||
data = self.data
|
data = self.data
|
||||||
|
prefiles = self.prefiles
|
||||||
|
postfiles = self.postfiles
|
||||||
bb.parse.init_parser(data)
|
bb.parse.init_parser(data)
|
||||||
|
|
||||||
# Parse files for loading *before* bitbake.conf and any includes
|
# 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:
|
if data.getVar("BB_INVALIDCONF", False) is True:
|
||||||
data.setVar("BB_INVALIDCONF", False)
|
data.setVar("BB_INVALIDCONF", False)
|
||||||
self.parseConfigurationFiles(self.prefiles, self.postfiles)
|
self.parseConfigurationFiles()
|
||||||
return
|
return
|
||||||
|
|
||||||
bb.parse.init_parser(data)
|
bb.parse.init_parser(data)
|
||||||
|
|
Loading…
Reference in New Issue