aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-24 15:23:54 +0100
committerAnuj Mittal <anuj.mittal@intel.com>2021-04-30 22:54:49 +0800
commit079aba1a6fdf1d4b034c2e32c952cd2c30b861ff (patch)
tree56ed0244d2c05fbe63f2aaffa77bd95d975af8e2
parentcbbdb5333d36bda3e6ce833d95960a8d4b09fbea (diff)
downloadopenembedded-core-contrib-079aba1a6fdf1d4b034c2e32c952cd2c30b861ff.tar.gz
openembedded-core-contrib-079aba1a6fdf1d4b034c2e32c952cd2c30b861ff.tar.bz2
openembedded-core-contrib-079aba1a6fdf1d4b034c2e32c952cd2c30b861ff.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit bf1b467dacf345379cd5d84a1c9b3b0d844d5c91) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rwxr-xr-xscripts/yocto-check-layer3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer
index b7c83c8b543..deba3cb4f8c 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']))