aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-12 11:24:38 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-19 15:44:36 +1200
commit052822083c17d3dee526e9197c38b428bf40673d (patch)
tree8eb35877fb1167302f3e7257aaa11be707853dfb
parentcbc396dd10488990c98bb6fd94c7d10a736d57c1 (diff)
downloadopenembedded-core-contrib-paule/yocto-compat-rename.tar.gz
openembedded-core-contrib-paule/yocto-compat-rename.tar.bz2
openembedded-core-contrib-paule/yocto-compat-rename.zip
scripts: rename yocto-compat-layer to remove "compatible" nomenclaturepaule/yocto-compat-rename
"Yocto Project Compatible" [1] is a programme which requires you meet specific criteria including going through an application process - it is not sufficient simply to run the script we have created here and have it produce no warnings/errors. To avoid people being confused by the fact that this script uses the term "compatible" or variations thereof, substitute usage of that word with "check" instead. The functionality of the script is unchanged. [1] https://www.yoctoproject.org/ecosystem/yocto-project-branding-program Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--scripts/lib/checklayer/__init__.py (renamed from scripts/lib/compatlayer/__init__.py)2
-rw-r--r--scripts/lib/checklayer/case.py (renamed from scripts/lib/compatlayer/case.py)2
-rw-r--r--scripts/lib/checklayer/cases/__init__.py (renamed from scripts/lib/compatlayer/cases/__init__.py)0
-rw-r--r--scripts/lib/checklayer/cases/bsp.py (renamed from scripts/lib/compatlayer/cases/bsp.py)10
-rw-r--r--scripts/lib/checklayer/cases/common.py (renamed from scripts/lib/compatlayer/cases/common.py)6
-rw-r--r--scripts/lib/checklayer/cases/distro.py (renamed from scripts/lib/compatlayer/cases/distro.py)8
-rw-r--r--scripts/lib/checklayer/context.py (renamed from scripts/lib/compatlayer/context.py)4
-rwxr-xr-xscripts/yocto-check-layer (renamed from scripts/yocto-compat-layer.py)20
-rwxr-xr-xscripts/yocto-check-layer-wrapper (renamed from scripts/yocto-compat-layer-wrapper)10
9 files changed, 31 insertions, 31 deletions
diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/checklayer/__init__.py
index 7197e850e4..6c2b86a79a 100644
--- a/scripts/lib/compatlayer/__init__.py
+++ b/scripts/lib/checklayer/__init__.py
@@ -1,4 +1,4 @@
-# Yocto Project compatibility layer tool
+# Yocto Project layer check tool
#
# Copyright (C) 2017 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
diff --git a/scripts/lib/compatlayer/case.py b/scripts/lib/checklayer/case.py
index 54ce78aa60..9dd00412e5 100644
--- a/scripts/lib/compatlayer/case.py
+++ b/scripts/lib/checklayer/case.py
@@ -3,5 +3,5 @@
from oeqa.core.case import OETestCase
-class OECompatLayerTestCase(OETestCase):
+class OECheckLayerTestCase(OETestCase):
pass
diff --git a/scripts/lib/compatlayer/cases/__init__.py b/scripts/lib/checklayer/cases/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/scripts/lib/compatlayer/cases/__init__.py
+++ b/scripts/lib/checklayer/cases/__init__.py
diff --git a/scripts/lib/compatlayer/cases/bsp.py b/scripts/lib/checklayer/cases/bsp.py
index 43efae406f..b6b611be73 100644
--- a/scripts/lib/compatlayer/cases/bsp.py
+++ b/scripts/lib/checklayer/cases/bsp.py
@@ -3,14 +3,14 @@
import unittest
-from compatlayer import LayerType, get_signatures, check_command, get_depgraph
-from compatlayer.case import OECompatLayerTestCase
+from checklayer import LayerType, get_signatures, check_command, get_depgraph
+from checklayer.case import OECheckLayerTestCase
-class BSPCompatLayer(OECompatLayerTestCase):
+class BSPCheckLayer(OECheckLayerTestCase):
@classmethod
def setUpClass(self):
if self.tc.layer['type'] != LayerType.BSP:
- raise unittest.SkipTest("BSPCompatLayer: Layer %s isn't BSP one." %\
+ raise unittest.SkipTest("BSPCheckLayer: Layer %s isn't BSP one." %\
self.tc.layer['name'])
def test_bsp_defines_machines(self):
@@ -62,7 +62,7 @@ class BSPCompatLayer(OECompatLayerTestCase):
This criteria can only be tested by testing different machines in combination,
i.e. one main layer, potentially several additional BSP layers and an explicit
choice of machines:
- yocto-compat-layer --additional-layers .../meta-intel --machines intel-corei7-64 imx6slevk -- .../meta-freescale
+ yocto-check-layer --additional-layers .../meta-intel --machines intel-corei7-64 imx6slevk -- .../meta-freescale
'''
if not self.td['machines']:
diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/checklayer/cases/common.py
index 55e8ba4c51..a13c1088f0 100644
--- a/scripts/lib/compatlayer/cases/common.py
+++ b/scripts/lib/checklayer/cases/common.py
@@ -4,10 +4,10 @@
import glob
import os
import unittest
-from compatlayer import get_signatures, LayerType, check_command, get_depgraph, compare_signatures
-from compatlayer.case import OECompatLayerTestCase
+from checklayer import get_signatures, LayerType, check_command, get_depgraph, compare_signatures
+from checklayer.case import OECheckLayerTestCase
-class CommonCompatLayer(OECompatLayerTestCase):
+class CommonCheckLayer(OECheckLayerTestCase):
def test_readme(self):
# The top-level README file may have a suffix (like README.rst or README.txt).
readme_files = glob.glob(os.path.join(self.tc.layer['path'], 'README*'))
diff --git a/scripts/lib/compatlayer/cases/distro.py b/scripts/lib/checklayer/cases/distro.py
index 523acc1e78..df1b3035eb 100644
--- a/scripts/lib/compatlayer/cases/distro.py
+++ b/scripts/lib/checklayer/cases/distro.py
@@ -3,14 +3,14 @@
import unittest
-from compatlayer import LayerType
-from compatlayer.case import OECompatLayerTestCase
+from checklayer import LayerType
+from checklayer.case import OECheckLayerTestCase
-class DistroCompatLayer(OECompatLayerTestCase):
+class DistroCheckLayer(OECheckLayerTestCase):
@classmethod
def setUpClass(self):
if self.tc.layer['type'] != LayerType.DISTRO:
- raise unittest.SkipTest("DistroCompatLayer: Layer %s isn't Distro one." %\
+ raise unittest.SkipTest("DistroCheckLayer: Layer %s isn't Distro one." %\
self.tc.layer['name'])
def test_distro_defines_distros(self):
diff --git a/scripts/lib/compatlayer/context.py b/scripts/lib/checklayer/context.py
index 7811d4ac20..1bec2c4103 100644
--- a/scripts/lib/compatlayer/context.py
+++ b/scripts/lib/checklayer/context.py
@@ -8,8 +8,8 @@ import re
from oeqa.core.context import OETestContext
-class CompatLayerTestContext(OETestContext):
+class CheckLayerTestContext(OETestContext):
def __init__(self, td=None, logger=None, layer=None, test_software_layer_signatures=True):
- super(CompatLayerTestContext, self).__init__(td, logger)
+ super(CheckLayerTestContext, self).__init__(td, logger)
self.layer = layer
self.test_software_layer_signatures = test_software_layer_signatures
diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-check-layer
index 9a541c66e5..5a4fd752ca 100755
--- a/scripts/yocto-compat-layer.py
+++ b/scripts/yocto-check-layer
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Yocto Project compatibility layer tool
+# Yocto Project layer checking tool
#
# Copyright (C) 2017 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
@@ -22,29 +22,29 @@ import scriptpath
scriptpath.add_oe_lib_path()
scriptpath.add_bitbake_lib_path()
-from compatlayer import LayerType, detect_layers, add_layer, add_layer_dependencies, get_signatures
+from checklayer import LayerType, detect_layers, add_layer, add_layer_dependencies, get_signatures
from oeqa.utils.commands import get_bb_vars
-PROGNAME = 'yocto-compat-layer'
+PROGNAME = 'yocto-check-layer'
CASES_PATHS = [os.path.join(os.path.abspath(os.path.dirname(__file__)),
- 'lib', 'compatlayer', 'cases')]
+ 'lib', 'checklayer', 'cases')]
logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout)
-def test_layer_compatibility(td, layer, test_software_layer_signatures):
- from compatlayer.context import CompatLayerTestContext
+def test_layer(td, layer, test_software_layer_signatures):
+ from checklayer.context import CheckLayerTestContext
logger.info("Starting to analyze: %s" % layer['name'])
logger.info("----------------------------------------------------------------------")
- tc = CompatLayerTestContext(td=td, logger=logger, layer=layer, test_software_layer_signatures=test_software_layer_signatures)
+ tc = CheckLayerTestContext(td=td, logger=logger, layer=layer, test_software_layer_signatures=test_software_layer_signatures)
tc.loadTests(CASES_PATHS)
return tc.runTests()
def main():
parser = argparse.ArgumentParser(
- description="Yocto Project compatibility layer tool",
+ description="Yocto Project layer checking tool",
add_help=False)
parser.add_argument('layers', metavar='LAYER_DIR', nargs='+',
- help='Layer to test compatibility with Yocto Project')
+ help='Layer to check')
parser.add_argument('-o', '--output-log',
help='File to output log (optional)', action='store')
parser.add_argument('--dependency', nargs="+",
@@ -179,7 +179,7 @@ def main():
layers_tested = layers_tested + 1
continue
- result = test_layer_compatibility(td, layer, args.test_software_layer_signatures)
+ result = test_layer(td, layer, args.test_software_layer_signatures)
results[layer['name']] = result
results_status[layer['name']] = 'PASS' if results[layer['name']].wasSuccessful() else 'FAIL'
layers_tested = layers_tested + 1
diff --git a/scripts/yocto-compat-layer-wrapper b/scripts/yocto-check-layer-wrapper
index b6baeb484e..bbf6ee176d 100755
--- a/scripts/yocto-compat-layer-wrapper
+++ b/scripts/yocto-check-layer-wrapper
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
-# Yocto Project compatibility layer tool wrapper
+# Yocto Project layer check tool wrapper
#
-# Creates a temprary build directory to run Yocto Project Compatible
+# Creates a temporary build directory to run the yocto-check-layer
# script to avoid a contaminated environment.
#
# Copyright (C) 2017 Intel Corporation
@@ -24,7 +24,7 @@ do
done
shift $(($OPTIND - 1))
-# generate a temp directory to run compat layer script
+# generate a temp directory to run check layer script
base_dir=$(realpath $BUILDDIR/../)
cd $base_dir
@@ -32,9 +32,9 @@ build_dir=$(mktemp -p $base_dir -d -t build-XXXX)
source oe-init-build-env $build_dir
if [[ $output_log != '' ]]; then
- yocto-compat-layer.py -o "$output_log" "$*"
+ yocto-check-layer -o "$output_log" "$*"
else
- yocto-compat-layer.py "$@"
+ yocto-check-layer "$@"
fi
retcode=$?