[PATCH 0/1] cookerdata.py: remove slash in the end

[PATCH 0/1] cookerdata.py: remove slash in the end

[Robert Yang]

The following changes since commit ddbeb56f4fb69831453f4b91f5410ba4fde9fa56:

  bitbake: cookerdata: Improve handling of ParseError (2016-03-29 23:21:52 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib 96108bac83f88289ad4851f781742f515e882f5d
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=96108bac83f88289ad4851f781742f515e882f5d

Robert Yang (1):
  cookerdata.py: remove slash in the end

 bitbake/lib/bb/cookerdata.py | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.7.4

[PATCH 1/1] cookerdata.py: remove slash in the end

[Robert Yang]

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>
---
 bitbake/lib/bb/cookerdata.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index c5fdf66..50259a9 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/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')
-- 
2.7.4