summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cookerdata.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-04-18 18:09:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-19 13:37:31 +0100
commitf9b160571f795dc9d9d42ad7e85969ec54b86430 (patch)
tree42e298824d86cfa452ad5355cf9a0dd6fe7888e7 /bitbake/lib/bb/cookerdata.py
parent4c31f35d791b58d0aa95101cca2efd5cedb9a84f (diff)
downloadpoky-f9b160571f795dc9d9d42ad7e85969ec54b86430.tar.gz
bitbake: cookerdata: Allow ~ in bblayers
Implemented processing of ~ in bblayer's paths if HOME environment variable is approved. (Bitbake rev: 3b8a656d3ccb543c32696229184ebf12237ad38e) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cookerdata.py')
-rw-r--r--bitbake/lib/bb/cookerdata.py3
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')