summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-03-30 02:32:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-30 21:29:56 +0100
commit2b1cb21d18fb18399e682021b866babeced9a4aa (patch)
tree11adb152452772bb08645e5b03e81d1e88b42caf
parent2f6be16c274974be5eb07641374d691ef049fe76 (diff)
downloadopenembedded-core-contrib-2b1cb21d18fb18399e682021b866babeced9a4aa.tar.gz
cookerdata.py: remove slash in the end
It's very possible that we added layer as: BBLAYERS += "/path/to/meta/" then there would be warning: WARNING: No bb files matched BBFILE_PATTERN_core '^/path/to/meta//' This patch can fix the problem. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cookerdata.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index c5fdf6637e..50259a9a07 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -292,6 +292,8 @@ class CookerDataBuilder(object):
parselog.debug(2, "Adding layer %s", layer)
if 'HOME' in approved and '~' in layer:
layer = os.path.expanduser(layer)
+ if layer.endswith('/'):
+ layer = layer.rstrip('/')
data.setVar('LAYERDIR', layer)
data = parse_config_file(os.path.join(layer, "conf", "layer.conf"), data)
data.expandVarref('LAYERDIR')