diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 4 |
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)" |