diff options
Diffstat (limited to 'scripts/lib/checklayer/__init__.py')
-rw-r--r-- | scripts/lib/checklayer/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index fe545607bb..e69a10f452 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py | |||
@@ -146,7 +146,7 @@ def detect_layers(layer_directories, no_auto): | |||
146 | 146 | ||
147 | return layers | 147 | return layers |
148 | 148 | ||
149 | def _find_layer_depends(depend, layers): | 149 | def _find_layer(depend, layers): |
150 | for layer in layers: | 150 | for layer in layers: |
151 | if 'collections' not in layer: | 151 | if 'collections' not in layer: |
152 | continue | 152 | continue |
@@ -156,7 +156,7 @@ def _find_layer_depends(depend, layers): | |||
156 | return layer | 156 | return layer |
157 | return None | 157 | return None |
158 | 158 | ||
159 | def add_layer_dependencies(bblayersconf, layer, layers, logger): | 159 | def 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'])) |
@@ -166,7 +166,7 @@ def add_layer_dependencies(bblayersconf, layer, layers, logger): | |||
166 | if depend == 'core': | 166 | if depend == 'core': |
167 | continue | 167 | continue |
168 | 168 | ||
169 | layer_depend = _find_layer_depends(depend, layers) | 169 | layer_depend = _find_layer(depend, layers) |
170 | if not layer_depend: | 170 | if not layer_depend: |
171 | logger.error('Layer %s depends on %s and isn\'t found.' % \ | 171 | logger.error('Layer %s depends on %s and isn\'t found.' % \ |
172 | (layer['name'], depend)) | 172 | (layer['name'], depend)) |
@@ -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 | |||
208 | def 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: |