From 2fe25da55e38e9335037f962893c83d20d7e3752 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sun, 10 Apr 2022 10:41:02 -0700 Subject: [PATCH] layerindex/utils.py: ignore 'core' in BBFILES_COLLECTIONS Many layers append BBFILE_COLLECTIONS and therefore have 'core ' During update.py, this means we are likely not handling the collection we expect: WARNING: /opt/workdir/git___git_openembedded_org_meta-openembedded/meta-oe: multiple collections found, handling first one (core) only BBFILE_COLLECTIONS = "core" Signed-off-by: Tim Orling --- layerindex/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/layerindex/utils.py b/layerindex/utils.py index 32be16d..497ab99 100644 --- a/layerindex/utils.py +++ b/layerindex/utils.py @@ -44,7 +44,12 @@ def get_layer_var(config_data, var, logger): collection = collection_list[0] layerdir = config_data.getVar('LAYERDIR', True) if len(collection_list) > 1: - logger.warn('%s: multiple collections found, handling first one (%s) only' % (layerdir, collection)) + if collection_list[0] == 'core': + # Many layers append BBFILE_COLLECTIONS and therefore have 'core ' + collection = collection_list[1] + logger.warn('%s: multiple collections found, ignoring the first one (\'core\') and handling (%s) only' % (layerdir, collection)) + else: + logger.warn('%s: multiple collections found, handling first one (%s) only' % (layerdir, collection)) if var == 'BBFILE_COLLECTIONS': return collection value = config_data.getVar('%s_%s' % (var, collection), True)