aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-06-01 21:09:38 -0700
committerArmin Kuster <akuster808@gmail.com>2019-06-26 15:47:47 -0700
commit723cd9e37221f90cc378b49a0c0f3419508500bb (patch)
treef2b4bef43cb95b55cf5215a79e731aacdd27b092
parent51a4c6b5179d087f647cf0c458edb8ab107826ef (diff)
downloadmeta-security-723cd9e37221f90cc378b49a0c0f3419508500bb.tar.gz
meta-security-723cd9e37221f90cc378b49a0c0f3419508500bb.tar.bz2
meta-security-723cd9e37221f90cc378b49a0c0f3419508500bb.zip
layers: set warrior only
remove TEST_SUITES from main layer.conf Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--conf/layer.conf4
-rw-r--r--meta-security-compliance/conf/layer.conf2
-rw-r--r--meta-tpm/conf/layer.conf2
3 files changed, 3 insertions, 5 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 4beac38..b9a4f25 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,8 +9,6 @@ BBFILE_COLLECTIONS += "security"
BBFILE_PATTERN_security = "^${LAYERDIR}/"
BBFILE_PRIORITY_security = "8"
-LAYERSERIES_COMPAT_security = "thud warrior"
+LAYERSERIES_COMPAT_security = "warrior"
LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python"
-
-DEFAULT_TEST_SUITES_pn-security-build-image = " ping ssh ptest"
diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf
index d48feb9..b245a16 100644
--- a/meta-security-compliance/conf/layer.conf
+++ b/meta-security-compliance/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "scanners-layer"
BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_scanners-layer = "10"
-LAYERSERIES_COMPAT_scanners-layer = "thud warrior"
+LAYERSERIES_COMPAT_scanners-layer = "warrior"
LAYERDEPENDS_scanners-layer = " \
core \
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf
index bf9a76e..cdccc55 100644
--- a/meta-tpm/conf/layer.conf
+++ b/meta-tpm/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "tpm-layer"
BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_tpm-layer = "10"
-LAYERSERIES_COMPAT_tpm-layer = "thud warrior"
+LAYERSERIES_COMPAT_tpm-layer = "warrior"
LAYERDEPENDS_tpm-layer = " \
core \