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>
This commit is contained in:
Ed Bartosh 2015-04-18 18:09:46 +03:00 committed by Richard Purdie
parent 4c31f35d79
commit f9b160571f
1 changed files with 3 additions and 0 deletions

View File

@ -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')