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:27:39 +0000 |
commit | 422710e0db921616a05cffc85be28e128e7188fa (patch) | |
tree | 98e5a9ad3b30f15e22ad44c2339ca7c44791d1f2 /scripts/yocto-check-layer | |
parent | 35015f17519d9395801632145d6457b58d29affe (diff) | |
download | poky-422710e0db921616a05cffc85be28e128e7188fa.tar.gz |
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)
(From OE-Core rev: 64310d9d18bb1751595c197e6955774ad5514844)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | |||
22 | scriptpath.add_oe_lib_path() | 22 | scriptpath.add_oe_lib_path() |
23 | scriptpath.add_bitbake_lib_path() | 23 | scriptpath.add_bitbake_lib_path() |
24 | 24 | ||
25 | from checklayer import LayerType, detect_layers, add_layer, add_layer_dependencies, get_signatures | 25 | from checklayer import LayerType, detect_layers, add_layers, add_layer_dependencies, get_signatures |
26 | from oeqa.utils.commands import get_bb_vars | 26 | from oeqa.utils.commands import get_bb_vars |
27 | 27 | ||
28 | PROGNAME = 'yocto-check-layer' | 28 | PROGNAME = 'yocto-check-layer' |
@@ -157,7 +157,7 @@ def main(): | |||
157 | layers_tested = layers_tested + 1 | 157 | layers_tested = layers_tested + 1 |
158 | continue | 158 | continue |
159 | 159 | ||
160 | if any(map(lambda additional_layer: not add_layer(bblayersconf, additional_layer, dep_layers, logger), | 160 | if any(map(lambda additional_layer: not add_layers(bblayersconf, [additional_layer], logger), |
161 | additional_layers)): | 161 | additional_layers)): |
162 | logger.info('Skipping %s due to missing additional layers.' % layer['name']) | 162 | logger.info('Skipping %s due to missing additional layers.' % layer['name']) |
163 | results[layer['name']] = None | 163 | results[layer['name']] = None |
@@ -179,7 +179,7 @@ def main(): | |||
179 | continue | 179 | continue |
180 | td['machines'] = args.machines | 180 | td['machines'] = args.machines |
181 | 181 | ||
182 | if not add_layer(bblayersconf, layer, dep_layers, logger): | 182 | if not add_layers(bblayersconf, [layer], logger): |
183 | logger.info('Skipping %s ???.' % layer['name']) | 183 | logger.info('Skipping %s ???.' % layer['name']) |
184 | results[layer['name']] = None | 184 | results[layer['name']] = None |
185 | results_status[layer['name']] = 'SKIPPED (Unknown)' | 185 | results_status[layer['name']] = 'SKIPPED (Unknown)' |