mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
a6a2c89692
commit
5501f12ef6
@@ -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)'
|
||||
|
||||
Reference in New Issue
Block a user