diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2019-02-12 18:16:42 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:25:07 +0000 |
| commit | 64310d9d18bb1751595c197e6955774ad5514844 (patch) | |
| tree | 6a6a20457aa8d9faf2f820b1f9c7b672436bd46d /scripts/yocto-check-layer | |
| parent | f236d8782958df953ca1e2a6f09779cbc8f2d600 (diff) | |
| download | openembedded-core-64310d9d18bb1751595c197e6955774ad5514844.tar.gz openembedded-core-64310d9d18bb1751595c197e6955774ad5514844.tar.bz2 openembedded-core-64310d9d18bb1751595c197e6955774ad5514844.zip | |
checklayer: Avoid adding the layer if it is already present
* 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]
(From OE-Core rev: b9cc18d83f55ff48c3d6e60c56359f6736d5a06a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'scripts/yocto-check-layer')
| -rwxr-xr-x | scripts/yocto-check-layer | 6 |
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)' |