summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
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-31 09:13:04 +0100
commitf719386841229e291e1284387abe1b4ccc5d445a (patch)
tree44e438188ac61922b9620a70cb4cbe5fff4024ca /bitbake/lib/bb
parente26087f09140153b54f6c5e65f596acbc1a80f16 (diff)
downloadpoky-f719386841229e291e1284387abe1b4ccc5d445a.tar.gz
bitbake: 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. (Bitbake rev: 2b1cb21d18fb18399e682021b866babeced9a4aa) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-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')