[oe-commits] [openembedded-core] 56/64: scripts/yocto-compat-layer.py: Add option to disable layer autodiscovery
git at git.openembedded.org
git at git.openembedded.org
Tue Mar 21 21:12:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit e8ca622293a32e2ccd9039aac7dee99b5054c927
Author: Aníbal Limón <anibal.limon at linux.intel.com>
AuthorDate: Mon Mar 20 17:33:25 2017 -0600
scripts/yocto-compat-layer.py: Add option to disable layer autodiscovery
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 <anibal.limon at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/lib/compatlayer/__init__.py | 17 ++++++++++++-----
scripts/yocto-compat-layer.py | 4 +++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py
index 15dc95d..b8ce771 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
diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-compat-layer.py
index b96f3ca..b4de84a 100755
--- a/scripts/yocto-compat-layer.py
+++ b/scripts/yocto-compat-layer.py
@@ -47,6 +47,8 @@ def main():
help='Layer to test compatibility with Yocto Project')
parser.add_argument('-o', '--output-log',
help='File to output log (optional)', action='store')
+ parser.add_argument('-n', '--no-auto', help='Disable auto layer discovery',
+ action='store_true')
parser.add_argument('-d', '--debug', help='Enable debug output',
action='store_true')
parser.add_argument('-q', '--quiet', help='Print only errors',
@@ -74,7 +76,7 @@ def main():
builddir = os.environ['BUILDDIR']
bblayersconf = os.path.join(builddir, 'conf', 'bblayers.conf')
- layers = detect_layers(args.layers)
+ layers = detect_layers(args.layers, args.no_auto)
if not layers:
logger.error("Fail to detect layers")
return 1
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list