bitbake: cookerdata: rename _parse to parse_config_file
We use this externally in the OE layer index update script, so it shouldn't really be named as an internal function. (Bitbake rev: 89332a7874e94c8d91ea24200f9739abb1a50397) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a4bf49052b
commit
25182cd849
|
@ -147,7 +147,7 @@ def catch_parse_error(func):
|
||||||
return wrapped
|
return wrapped
|
||||||
|
|
||||||
@catch_parse_error
|
@catch_parse_error
|
||||||
def _parse(fn, data, include=True):
|
def parse_config_file(fn, data, include=True):
|
||||||
return bb.parse.handle(fn, data, include)
|
return bb.parse.handle(fn, data, include)
|
||||||
|
|
||||||
@catch_parse_error
|
@catch_parse_error
|
||||||
|
@ -211,12 +211,12 @@ class CookerDataBuilder(object):
|
||||||
|
|
||||||
# Parse files for loading *before* bitbake.conf and any includes
|
# Parse files for loading *before* bitbake.conf and any includes
|
||||||
for f in prefiles:
|
for f in prefiles:
|
||||||
data = _parse(f, data)
|
data = parse_config_file(f, data)
|
||||||
|
|
||||||
layerconf = self._findLayerConf()
|
layerconf = self._findLayerConf()
|
||||||
if layerconf:
|
if layerconf:
|
||||||
parselog.debug(2, "Found bblayers.conf (%s)", layerconf)
|
parselog.debug(2, "Found bblayers.conf (%s)", layerconf)
|
||||||
data = _parse(layerconf, data)
|
data = parse_config_file(layerconf, data)
|
||||||
|
|
||||||
layers = (data.getVar('BBLAYERS', True) or "").split()
|
layers = (data.getVar('BBLAYERS', True) or "").split()
|
||||||
|
|
||||||
|
@ -224,7 +224,7 @@ class CookerDataBuilder(object):
|
||||||
for layer in layers:
|
for layer in layers:
|
||||||
parselog.debug(2, "Adding layer %s", layer)
|
parselog.debug(2, "Adding layer %s", layer)
|
||||||
data.setVar('LAYERDIR', layer)
|
data.setVar('LAYERDIR', layer)
|
||||||
data = _parse(os.path.join(layer, "conf", "layer.conf"), data)
|
data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data)
|
||||||
data.expandVarref('LAYERDIR')
|
data.expandVarref('LAYERDIR')
|
||||||
|
|
||||||
data.delVar('LAYERDIR')
|
data.delVar('LAYERDIR')
|
||||||
|
@ -232,11 +232,11 @@ class CookerDataBuilder(object):
|
||||||
if not data.getVar("BBPATH", True):
|
if not data.getVar("BBPATH", True):
|
||||||
raise SystemExit("The BBPATH variable is not set")
|
raise SystemExit("The BBPATH variable is not set")
|
||||||
|
|
||||||
data = _parse(os.path.join("conf", "bitbake.conf"), data)
|
data = parse_config_file(os.path.join("conf", "bitbake.conf"), data)
|
||||||
|
|
||||||
# Parse files for loading *after* bitbake.conf and any includes
|
# Parse files for loading *after* bitbake.conf and any includes
|
||||||
for p in postfiles:
|
for p in postfiles:
|
||||||
data = _parse(p, data)
|
data = parse_config_file(p, data)
|
||||||
|
|
||||||
# Handle any INHERITs and inherit the base class
|
# Handle any INHERITs and inherit the base class
|
||||||
bbclasses = ["base"] + (data.getVar('INHERIT', True) or "").split()
|
bbclasses = ["base"] + (data.getVar('INHERIT', True) or "").split()
|
||||||
|
|
Loading…
Reference in New Issue