From bf59f39653d70b99c12ee2f4c6949f9c9bcf5462 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 24 Apr 2021 15:23:54 +0100 Subject: yocto-check-layer: Avoid bug when iterating and autoadding dependencies If iterating a layer with multiple components and auto-adding dependencies the tests can break since layers are never removed and order isn't guaranteed to account for that. Fix this by resetting the layer list back to the original list each time before auto-adding the dependencies in each case. This fixes scanning of meta-openembedded in particular where the sublayers may not be added in order of minimal dependency. (From OE-Core rev: bf1b467dacf345379cd5d84a1c9b3b0d844d5c91) Signed-off-by: Richard Purdie --- scripts/yocto-check-layer | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer index b7c83c8b54..deba3cb4f8 100755 --- a/scripts/yocto-check-layer +++ b/scripts/yocto-check-layer @@ -138,6 +138,9 @@ def main(): layer['type'] == LayerType.ERROR_BSP_DISTRO: continue + # Reset to a clean backup copy for each run + shutil.copyfile(bblayersconf + '.backup', bblayersconf) + if check_bblayers(bblayersconf, layer['path'], logger): logger.info("%s already in %s. To capture initial signatures, layer under test should not present " "in BBLAYERS. Please remove %s from BBLAYERS." % (layer['name'], bblayersconf, layer['name'])) -- cgit v1.2.3-54-g00ecf