summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-19 14:20:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:49 +0100
commit22e8c6cbd3070d65741a1fd7f05a40373c236a50 (patch)
tree84b82b8fc3670b96789b24ca926c26a8d27723df
parentc4989e7bf37838b3c734034b0c6e1084d6253dce (diff)
downloadopenembedded-core-contrib-22e8c6cbd3070d65741a1fd7f05a40373c236a50.tar.gz
bitbake: bitbake-layers: remove-layer: accept just layer directory
If the specified layer isn't a path, then just match on the directory. Fixes [YOCTO #7839]. (Bitbake rev: b4c45bf6c42b4d319ba868f4ce77e86c8b585818) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake-layers2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index 1c0d520d10..bd05c5f69e 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -120,6 +120,8 @@ Removes the specified layer from bblayers.conf
if args.layerdir.startswith('*'):
layerdir = args.layerdir
+ elif not '/' in args.layerdir:
+ layerdir = '*/%s' % args.layerdir
else:
layerdir = os.path.abspath(args.layerdir)
(_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdir)