diff options
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 6c11a60e0f..630ee27589 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -269,8 +269,11 @@ class CookerDataBuilder(object): | |||
269 | layers = (data.getVar('BBLAYERS', True) or "").split() | 269 | layers = (data.getVar('BBLAYERS', True) or "").split() |
270 | 270 | ||
271 | data = bb.data.createCopy(data) | 271 | data = bb.data.createCopy(data) |
272 | approved = bb.utils.approved_variables() | ||
272 | for layer in layers: | 273 | for layer in layers: |
273 | parselog.debug(2, "Adding layer %s", layer) | 274 | parselog.debug(2, "Adding layer %s", layer) |
275 | if 'HOME' in approved and '~' in layer: | ||
276 | layer = os.path.expanduser(layer) | ||
274 | data.setVar('LAYERDIR', layer) | 277 | data.setVar('LAYERDIR', layer) |
275 | data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data) | 278 | data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data) |
276 | data.expandVarref('LAYERDIR') | 279 | data.expandVarref('LAYERDIR') |