summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/cookerdata.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index c5fdf6637e..50259a9a07 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -292,6 +292,8 @@ class CookerDataBuilder(object):
292 parselog.debug(2, "Adding layer %s", layer) 292 parselog.debug(2, "Adding layer %s", layer)
293 if 'HOME' in approved and '~' in layer: 293 if 'HOME' in approved and '~' in layer:
294 layer = os.path.expanduser(layer) 294 layer = os.path.expanduser(layer)
295 if layer.endswith('/'):
296 layer = layer.rstrip('/')
295 data.setVar('LAYERDIR', layer) 297 data.setVar('LAYERDIR', layer)
296 data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data) 298 data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data)
297 data.expandVarref('LAYERDIR') 299 data.expandVarref('LAYERDIR')