From a2c571d75749fc09255b138d6fa0049b8e489a7f Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Mon, 14 Oct 2019 11:16:09 -0400
Subject: meta-security: subtree update:caaeb67863..a0dee993cd

Armin Kuster (1):
      layer.conf: Update for zeus series

Change-Id: I23627a0fcc2a55a051cb6c77af5fd3a569d5b1a2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-security/conf/layer.conf                          | 2 +-
 meta-security/meta-integrity/conf/layer.conf           | 2 +-
 meta-security/meta-security-compliance/conf/layer.conf | 2 +-
 meta-security/meta-tpm/conf/layer.conf                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'meta-security')

diff --git a/meta-security/conf/layer.conf b/meta-security/conf/layer.conf
index b9a4f254c..3e890e12e 100644
--- a/meta-security/conf/layer.conf
+++ b/meta-security/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "security"
 BBFILE_PATTERN_security = "^${LAYERDIR}/"
 BBFILE_PRIORITY_security = "8"
 
-LAYERSERIES_COMPAT_security = "warrior"
+LAYERSERIES_COMPAT_security = "zeus"
 
 LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python"
diff --git a/meta-security/meta-integrity/conf/layer.conf b/meta-security/meta-integrity/conf/layer.conf
index 41989da38..962424ccb 100644
--- a/meta-security/meta-integrity/conf/layer.conf
+++ b/meta-security/meta-integrity/conf/layer.conf
@@ -21,6 +21,6 @@ INTEGRITY_BASE := '${LAYERDIR}'
 # interactive shell is enough.
 OE_TERMINAL_EXPORTS += "INTEGRITY_BASE"
 
-LAYERSERIES_COMPAT_integrity = "warrior"
+LAYERSERIES_COMPAT_integrity = "zeus"
 # ima-evm-utils depends on keyutils from meta-oe
 LAYERDEPENDS_integrity = "core openembedded-layer"
diff --git a/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf
index 9ccadab8b..0e93bd0e8 100644
--- a/meta-security/meta-security-compliance/conf/layer.conf
+++ b/meta-security/meta-security-compliance/conf/layer.conf
@@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "scanners-layer"
 BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_scanners-layer = "10"
 
-LAYERSERIES_COMPAT_scanners-layer = "warrior"
+LAYERSERIES_COMPAT_scanners-layer = "zeus"
 
 LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python"
diff --git a/meta-security/meta-tpm/conf/layer.conf b/meta-security/meta-tpm/conf/layer.conf
index cdccc553e..3af2d9517 100644
--- a/meta-security/meta-tpm/conf/layer.conf
+++ b/meta-security/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 = "warrior"
+LAYERSERIES_COMPAT_tpm-layer = "zeus"
 
 LAYERDEPENDS_tpm-layer = " \
     core \
-- 
cgit v1.2.3