From 4eb0932e755b7cb582a8db811aeed1397ecb92cc Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 30 Mar 2017 21:30:29 -0500 Subject: yocto-compat-layer.py: Fix the signature validation The initial signatures need to be collected -after- the dependency layers have been added to the system. Otherwise changes that happen due to dependencies, outside of the layer being scanned, will show up as signature problems. The add_layer function was split into two pieces so that we can process the dependencies first, and then add the layer itself for the comparison. Signed-off-by: Mark Hatle Signed-off-by: Ross Burton --- scripts/lib/compatlayer/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/lib') diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 8d8bdfe939..86f86eb657 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -140,9 +140,7 @@ def _find_layer_depends(depend, layers): return layer return None -def add_layer(bblayersconf, layer, layers, logger): - logger.info('Adding layer %s' % layer['name']) - +def add_layer_dependencies(bblayersconf, layer, layers, logger): def recurse_dependencies(depends, layer, layers, logger, ret = []): logger.debug('Processing dependencies %s for layer %s.' % \ (depends, layer['name'])) @@ -192,7 +190,10 @@ def add_layer(bblayersconf, layer, layers, logger): logger.info('Adding layer dependency %s' % layer_depend['name']) with open(bblayersconf, 'a+') as f: f.write("\nBBLAYERS += \"%s\"\n" % layer_depend['path']) + return True +def add_layer(bblayersconf, layer, layers, logger): + logger.info('Adding layer %s' % layer['name']) with open(bblayersconf, 'a+') as f: f.write("\nBBLAYERS += \"%s\"\n" % layer['path']) -- cgit 1.2.3-korg