MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

update: fix setup of BBLAYERS

Browse Source 
So with honister / current master we can no longer get away with
bypassing BBLAYERS - it now needs to point to the core layer at
minimum. This is fine, we just need to skip parsing layer.conf if we're
parsing the core layer or we get some extra warnings we don't need.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.microsoft.com>
This commit is contained in:
Paul Eggleton 2021-10-20 10:02:53 +13:00
parent fe0bd7ddf5
commit 38e6288c7d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layerindex/recipeparse.py
View File

@ -79,6 +79,7 @@ def init_parser(settings, branch, bitbakepath, enable_tracking=False, nocheckout
if not classic:
# We need this to avoid problems with AVAILABLE_LICENSES
f.write('COREBASE = "%s"\n' % core_repodir)
f.write('BBLAYERS = "%s/meta"\n' % core_repodir)
pass
if logger:

6
layerindex/update_layer.py
View File

@ -397,7 +397,11 @@ def main():
tinfoil.config_data.setVar('LICENSE', '')
layerconfparser = layerconfparse.LayerConfParse(logger=logger, tinfoil=tinfoil)
layer_config_data = layerconfparser.parse_layer(layerdir)
if layer.name == settings.CORE_LAYER_NAME:
# Skip parsing the core layer, we already did via BBLAYERS
layer_config_data = layerconfparser.config_data_copy
else:
layer_config_data = layerconfparser.parse_layer(layerdir)
if not layer_config_data:
logger.info("Skipping update of layer %s for branch %s - conf/layer.conf may have parse issues" % (layer.name, branchdesc))
layerconfparser.shutdown()