aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-01-25 15:09:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-12 22:01:20 +0000
commita1f251e5ab859d6d4a2cb908408d4ddcab5a5de1 (patch)
tree4022d9a2f93382bc59afc670efedae8dde02c327
parent8da9242702fbef8cf3156b95a1076802e0f653c7 (diff)
downloadbitbake-contrib-a1f251e5ab859d6d4a2cb908408d4ddcab5a5de1.tar.gz
bitbake: cookerdata: Check duplicated BBFILE_COLLECTIONS
It shouldn't work when there are duplicated BBFILE_COLLECTIONS. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cookerdata.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index 5df66e617..09412e28c 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -391,7 +391,11 @@ class CookerDataBuilder(object):
bb.fatal("BBFILES_DYNAMIC entries must be of the form <collection name>:<filename pattern>, not:\n %s" % "\n ".join(invalid))
layerseries = set((data.getVar("LAYERSERIES_CORENAMES") or "").split())
+ collections_tmp = collections[:]
for c in collections:
+ collections_tmp.remove(c)
+ if c in collections_tmp:
+ bb.fatal("Found duplicated BBFILE_COLLECTIONS '%s', check bblayers.conf or layer.conf to fix it." % c)
compat = set((data.getVar("LAYERSERIES_COMPAT_%s" % c) or "").split())
if compat and not (compat & layerseries):
bb.fatal("Layer %s is not compatible with the core layer which only supports these series: %s (layer is compatible with %s)"