From f9b160571f795dc9d9d42ad7e85969ec54b86430 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Sat, 18 Apr 2015 18:09:46 +0300 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/cookerdata.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bitbake/lib') 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): layers = (data.getVar('BBLAYERS', True) or "").split() data = bb.data.createCopy(data) + approved = bb.utils.approved_variables() for layer in layers: parselog.debug(2, "Adding layer %s", layer) + if 'HOME' in approved and '~' in layer: + layer = os.path.expanduser(layer) data.setVar('LAYERDIR', layer) data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data) data.expandVarref('LAYERDIR') -- cgit v1.2.3-54-g00ecf