diff options
| -rw-r--r-- | bitbake/lib/bb/cookerdata.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 70e22b4a56..c4a28c86c5 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
| @@ -147,7 +147,7 @@ def catch_parse_error(func): | |||
| 147 | return wrapped | 147 | return wrapped |
| 148 | 148 | ||
| 149 | @catch_parse_error | 149 | @catch_parse_error |
| 150 | def _parse(fn, data, include=True): | 150 | def parse_config_file(fn, data, include=True): |
| 151 | return bb.parse.handle(fn, data, include) | 151 | return bb.parse.handle(fn, data, include) |
| 152 | 152 | ||
| 153 | @catch_parse_error | 153 | @catch_parse_error |
| @@ -211,12 +211,12 @@ class CookerDataBuilder(object): | |||
| 211 | 211 | ||
| 212 | # Parse files for loading *before* bitbake.conf and any includes | 212 | # Parse files for loading *before* bitbake.conf and any includes |
| 213 | for f in prefiles: | 213 | for f in prefiles: |
| 214 | data = _parse(f, data) | 214 | data = parse_config_file(f, data) |
| 215 | 215 | ||
| 216 | layerconf = self._findLayerConf() | 216 | layerconf = self._findLayerConf() |
| 217 | if layerconf: | 217 | if layerconf: |
| 218 | parselog.debug(2, "Found bblayers.conf (%s)", layerconf) | 218 | parselog.debug(2, "Found bblayers.conf (%s)", layerconf) |
| 219 | data = _parse(layerconf, data) | 219 | data = parse_config_file(layerconf, data) |
| 220 | 220 | ||
| 221 | layers = (data.getVar('BBLAYERS', True) or "").split() | 221 | layers = (data.getVar('BBLAYERS', True) or "").split() |
| 222 | 222 | ||
| @@ -224,7 +224,7 @@ class CookerDataBuilder(object): | |||
| 224 | for layer in layers: | 224 | for layer in layers: |
| 225 | parselog.debug(2, "Adding layer %s", layer) | 225 | parselog.debug(2, "Adding layer %s", layer) |
| 226 | data.setVar('LAYERDIR', layer) | 226 | data.setVar('LAYERDIR', layer) |
| 227 | data = _parse(os.path.join(layer, "conf", "layer.conf"), data) | 227 | data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data) |
| 228 | data.expandVarref('LAYERDIR') | 228 | data.expandVarref('LAYERDIR') |
| 229 | 229 | ||
| 230 | data.delVar('LAYERDIR') | 230 | data.delVar('LAYERDIR') |
| @@ -232,11 +232,11 @@ class CookerDataBuilder(object): | |||
| 232 | if not data.getVar("BBPATH", True): | 232 | if not data.getVar("BBPATH", True): |
| 233 | raise SystemExit("The BBPATH variable is not set") | 233 | raise SystemExit("The BBPATH variable is not set") |
| 234 | 234 | ||
| 235 | data = _parse(os.path.join("conf", "bitbake.conf"), data) | 235 | data = parse_config_file(os.path.join("conf", "bitbake.conf"), data) |
| 236 | 236 | ||
| 237 | # Parse files for loading *after* bitbake.conf and any includes | 237 | # Parse files for loading *after* bitbake.conf and any includes |
| 238 | for p in postfiles: | 238 | for p in postfiles: |
| 239 | data = _parse(p, data) | 239 | data = parse_config_file(p, data) |
| 240 | 240 | ||
| 241 | # Handle any INHERITs and inherit the base class | 241 | # Handle any INHERITs and inherit the base class |
| 242 | bbclasses = ["base"] + (data.getVar('INHERIT', True) or "").split() | 242 | bbclasses = ["base"] + (data.getVar('INHERIT', True) or "").split() |
