summaryrefslogtreecommitdiffstats
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-14 11:21:58 +0000
commit5fa3b5b15229babc9f96606c79436ab83651bf83 (patch)
tree67278602332bcc5ca1200c0248b1911b78ca77f6
parent2f17b87f9712d0e218d656dae0037d15a019f9f6 (diff)
downloadpoky-5fa3b5b15229babc9f96606c79436ab83651bf83.tar.gz
bitbake: bitbake: cookerdata: Check duplicated BBFILE_COLLECTIONS
It shouldn't work when there are duplicated BBFILE_COLLECTIONS. (Bitbake rev: a1f251e5ab859d6d4a2cb908408d4ddcab5a5de1) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cookerdata.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 5df66e6173..09412e28cf 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -391,7 +391,11 @@ class CookerDataBuilder(object):
391 bb.fatal("BBFILES_DYNAMIC entries must be of the form <collection name>:<filename pattern>, not:\n %s" % "\n ".join(invalid)) 391 bb.fatal("BBFILES_DYNAMIC entries must be of the form <collection name>:<filename pattern>, not:\n %s" % "\n ".join(invalid))
392 392
393 layerseries = set((data.getVar("LAYERSERIES_CORENAMES") or "").split()) 393 layerseries = set((data.getVar("LAYERSERIES_CORENAMES") or "").split())
394 collections_tmp = collections[:]
394 for c in collections: 395 for c in collections:
396 collections_tmp.remove(c)
397 if c in collections_tmp:
398 bb.fatal("Found duplicated BBFILE_COLLECTIONS '%s', check bblayers.conf or layer.conf to fix it." % c)
395 compat = set((data.getVar("LAYERSERIES_COMPAT_%s" % c) or "").split()) 399 compat = set((data.getVar("LAYERSERIES_COMPAT_%s" % c) or "").split())
396 if compat and not (compat & layerseries): 400 if compat and not (compat & layerseries):
397 bb.fatal("Layer %s is not compatible with the core layer which only supports these series: %s (layer is compatible with %s)" 401 bb.fatal("Layer %s is not compatible with the core layer which only supports these series: %s (layer is compatible with %s)"