diff options
Diffstat (limited to 'scripts/yocto-check-layer')
-rwxr-xr-x | scripts/yocto-check-layer | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer index 9aeb311c95..2445ad5e43 100755 --- a/scripts/yocto-check-layer +++ b/scripts/yocto-check-layer | |||
@@ -24,7 +24,7 @@ import scriptpath | |||
24 | scriptpath.add_oe_lib_path() | 24 | scriptpath.add_oe_lib_path() |
25 | scriptpath.add_bitbake_lib_path() | 25 | scriptpath.add_bitbake_lib_path() |
26 | 26 | ||
27 | from checklayer import LayerType, detect_layers, add_layers, add_layer_dependencies, get_signatures, check_bblayers | 27 | from checklayer import LayerType, detect_layers, add_layers, add_layer_dependencies, get_layer_dependencies, get_signatures, check_bblayers |
28 | from oeqa.utils.commands import get_bb_vars | 28 | from oeqa.utils.commands import get_bb_vars |
29 | 29 | ||
30 | PROGNAME = 'yocto-check-layer' | 30 | PROGNAME = 'yocto-check-layer' |
@@ -51,6 +51,8 @@ def main(): | |||
51 | help='File to output log (optional)', action='store') | 51 | help='File to output log (optional)', action='store') |
52 | parser.add_argument('--dependency', nargs="+", | 52 | parser.add_argument('--dependency', nargs="+", |
53 | help='Layers to process for dependencies', action='store') | 53 | help='Layers to process for dependencies', action='store') |
54 | parser.add_argument('--no-auto-dependency', help='Disable automatic testing of dependencies', | ||
55 | action='store_true') | ||
54 | parser.add_argument('--machines', nargs="+", | 56 | parser.add_argument('--machines', nargs="+", |
55 | help='List of MACHINEs to be used during testing', action='store') | 57 | help='List of MACHINEs to be used during testing', action='store') |
56 | parser.add_argument('--additional-layers', nargs="+", | 58 | parser.add_argument('--additional-layers', nargs="+", |
@@ -121,6 +123,21 @@ def main(): | |||
121 | if not layers: | 123 | if not layers: |
122 | return 1 | 124 | return 1 |
123 | 125 | ||
126 | # Find all dependencies, and get them checked too | ||
127 | if not args.no_auto_dependency: | ||
128 | depends = [] | ||
129 | for layer in layers: | ||
130 | layer_depends = get_layer_dependencies(layer, dep_layers, logger) | ||
131 | if layer_depends: | ||
132 | for d in layer_depends: | ||
133 | if d not in depends: | ||
134 | depends.append(d) | ||
135 | |||
136 | for d in depends: | ||
137 | if d not in layers: | ||
138 | logger.info("Adding %s to the list of layers to test, as a dependency", d['name']) | ||
139 | layers.append(d) | ||
140 | |||
124 | shutil.copyfile(bblayersconf, bblayersconf + '.backup') | 141 | shutil.copyfile(bblayersconf, bblayersconf + '.backup') |
125 | def cleanup_bblayers(signum, frame): | 142 | def cleanup_bblayers(signum, frame): |
126 | shutil.copyfile(bblayersconf + '.backup', bblayersconf) | 143 | shutil.copyfile(bblayersconf + '.backup', bblayersconf) |