From f2f6f0c938226802163698ef14a8a9103da362a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Mon, 20 Mar 2017 17:33:25 -0600 Subject: scripts/yocto-compat-layer.py: Add option to disable layer autodiscovery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes there is a need to only analyze the layer specified by the command line, the new option -n will disable autodiscovery of layers and only will try to test specified layers. Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton --- scripts/lib/compatlayer/__init__.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'scripts/lib') diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 15dc95da1f..b8ce771319 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -108,20 +108,27 @@ def _detect_layer(layer_path): return layer -def detect_layers(layer_directories): +def detect_layers(layer_directories, no_auto): layers = [] for directory in layer_directories: if directory[-1] == '/': directory = directory[0:-1] - for root, dirs, files in os.walk(directory): - dir_name = os.path.basename(root) - conf_dir = os.path.join(root, 'conf') + if no_auto: + conf_dir = os.path.join(directory, 'conf') if os.path.isdir(conf_dir): - layer = _detect_layer(root) + layer = _detect_layer(directory) if layer: layers.append(layer) + else: + for root, dirs, files in os.walk(directory): + dir_name = os.path.basename(root) + conf_dir = os.path.join(root, 'conf') + if os.path.isdir(conf_dir): + layer = _detect_layer(root) + if layer: + layers.append(layer) return layers -- cgit v1.2.3