summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2021-07-22 14:46:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-10 11:14:11 +0100
commit6f1a5a87830243ca085724ee1c1d631123dee0ec (patch)
tree8055caf74ec6506154ff5d778d3201fa311fe8ef /scripts
parent123068a0f46830431e4f86ecb16bd77df178547a (diff)
downloadpoky-6f1a5a87830243ca085724ee1c1d631123dee0ec.tar.gz
checklayer: new function get_layer_dependencies()
Split add_layer_dependencies() into 2 parts. First search for layer dependencies, and then add them to the config. That allows us to call get_layer_dependencies() independently. (From OE-Core rev: e11c7ceed212c0d38e3d38de3099389a4e397818) Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 08edf928aac3f2daaa0c256d4c21e56e2db72bff) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/checklayer/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py
index fe545607bb..72d9df0a62 100644
--- a/scripts/lib/checklayer/__init__.py
+++ b/scripts/lib/checklayer/__init__.py
@@ -156,7 +156,7 @@ def _find_layer_depends(depend, layers):
156 return layer 156 return layer
157 return None 157 return None
158 158
159def add_layer_dependencies(bblayersconf, layer, layers, logger): 159def get_layer_dependencies(layer, layers, logger):
160 def recurse_dependencies(depends, layer, layers, logger, ret = []): 160 def recurse_dependencies(depends, layer, layers, logger, ret = []):
161 logger.debug('Processing dependencies %s for layer %s.' % \ 161 logger.debug('Processing dependencies %s for layer %s.' % \
162 (depends, layer['name'])) 162 (depends, layer['name']))
@@ -203,6 +203,11 @@ def add_layer_dependencies(bblayersconf, layer, layers, logger):
203 layer_depends = recurse_dependencies(depends, layer, layers, logger, layer_depends) 203 layer_depends = recurse_dependencies(depends, layer, layers, logger, layer_depends)
204 204
205 # Note: [] (empty) is allowed, None is not! 205 # Note: [] (empty) is allowed, None is not!
206 return layer_depends
207
208def add_layer_dependencies(bblayersconf, layer, layers, logger):
209
210 layer_depends = get_layer_dependencies(layer, layers, logger)
206 if layer_depends is None: 211 if layer_depends is None:
207 return False 212 return False
208 else: 213 else: