summaryrefslogtreecommitdiffstats
path: root/scripts/yocto-check-layer
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-02-12 18:06:27 +0800
committerRobert Yang <liezhi.yang@windriver.com>2019-02-12 18:15:25 +0800
commita5abeb20791dade2fc900ce1940b13f584a8807e (patch)
tree7b0eabd45b38514747a54b0e3fa47eeed12ec2f3 /scripts/yocto-check-layer
parentb8d94b5b58d4a3572ae32accb269b71d3aeb934a (diff)
downloadopenembedded-core-contrib-rbt/check.tar.gz
openembedded-core-contrib-rbt/check.tar.bz2
openembedded-core-contrib-rbt/check.zip
checklayer: Avoid adding the layer if it is already presentrbt/check
* Rename add_layer() to add_layers() so that add_layer_dependencies() can re-use it. * Avoid adding the layer if it is already present [YOCTO #13148] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'scripts/yocto-check-layer')
-rwxr-xr-xscripts/yocto-check-layer6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer
index 9b7e53679b..106c955251 100755
--- a/scripts/yocto-check-layer
+++ b/scripts/yocto-check-layer
@@ -22,7 +22,7 @@ import scriptpath
scriptpath.add_oe_lib_path()
scriptpath.add_bitbake_lib_path()
-from checklayer import LayerType, detect_layers, add_layer, add_layer_dependencies, get_signatures
+from checklayer import LayerType, detect_layers, add_layers, add_layer_dependencies, get_signatures
from oeqa.utils.commands import get_bb_vars
PROGNAME = 'yocto-check-layer'
@@ -157,7 +157,7 @@ def main():
layers_tested = layers_tested + 1
continue
- if any(map(lambda additional_layer: not add_layer(bblayersconf, additional_layer, dep_layers, logger),
+ if any(map(lambda additional_layer: not add_layers(bblayersconf, [additional_layer], logger),
additional_layers)):
logger.info('Skipping %s due to missing additional layers.' % layer['name'])
results[layer['name']] = None
@@ -179,7 +179,7 @@ def main():
continue
td['machines'] = args.machines
- if not add_layer(bblayersconf, layer, dep_layers, logger):
+ if not add_layers(bblayersconf, [layer], logger):
logger.info('Skipping %s ???.' % layer['name'])
results[layer['name']] = None
results_status[layer['name']] = 'SKIPPED (Unknown)'