From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 25 Jan 2019 07:09:29 +0000 (+0800)
Subject: bitbake: bitbake: cookerdata: Check duplicated BBFILE_COLLECTIONS
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa3b5b15229babc9f96606c79436ab83651bf83;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 5df66e6173e..09412e28cf9 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/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)"