diff options
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-24 15:23:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-24 15:26:25 +0100
commit2e63733016f275e48e09edf7ef8f70df5888dfb7 (patch)
parenteb95a4f30e26690a90ff70e2c2e46195b090527d (diff)
yocto-check-layer: Avoid bug when iterating and autoadding dependenciesmaster-next
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 files changed, 3 insertions, 0 deletions
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:
+ # 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']))