From 723cd9e37221f90cc378b49a0c0f3419508500bb Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 1 Jun 2019 21:09:38 -0700 Subject: layers: set warrior only remove TEST_SUITES from main layer.conf Signed-off-by: Armin Kuster --- conf/layer.conf | 4 +--- meta-security-compliance/conf/layer.conf | 2 +- meta-tpm/conf/layer.conf | 2 +- 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 \ -- cgit v1.2.3-54-g00ecf