diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-10-08 15:53:13 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-10-11 07:41:01 -0700 |
commit | a0dee993cd385bec1f1dbc8508e9b32d1f285598 (patch) | |
tree | 0c8b2d1acc0880835a0f388f5f455ca41bd42a34 | |
parent | caaeb67863a6d3586e4c5ec62f85c33f8eb92af3 (diff) | |
download | meta-security-a0dee993cd385bec1f1dbc8508e9b32d1f285598.tar.gz |
layer.conf: Update for zeus series
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-integrity/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-security-compliance/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-tpm/conf/layer.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index b9a4f25..3e890e1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "security" | |||
9 | BBFILE_PATTERN_security = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_security = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_security = "8" | 10 | BBFILE_PRIORITY_security = "8" |
11 | 11 | ||
12 | LAYERSERIES_COMPAT_security = "warrior" | 12 | LAYERSERIES_COMPAT_security = "zeus" |
13 | 13 | ||
14 | LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python" | 14 | LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python" |
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf index 41989da..962424c 100644 --- a/meta-integrity/conf/layer.conf +++ b/meta-integrity/conf/layer.conf | |||
@@ -21,6 +21,6 @@ INTEGRITY_BASE := '${LAYERDIR}' | |||
21 | # interactive shell is enough. | 21 | # interactive shell is enough. |
22 | OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" | 22 | OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" |
23 | 23 | ||
24 | LAYERSERIES_COMPAT_integrity = "warrior" | 24 | LAYERSERIES_COMPAT_integrity = "zeus" |
25 | # ima-evm-utils depends on keyutils from meta-oe | 25 | # ima-evm-utils depends on keyutils from meta-oe |
26 | LAYERDEPENDS_integrity = "core openembedded-layer" | 26 | LAYERDEPENDS_integrity = "core openembedded-layer" |
diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf index 9ccadab..0e93bd0 100644 --- a/meta-security-compliance/conf/layer.conf +++ b/meta-security-compliance/conf/layer.conf | |||
@@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "scanners-layer" | |||
8 | BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_scanners-layer = "10" | 9 | BBFILE_PRIORITY_scanners-layer = "10" |
10 | 10 | ||
11 | LAYERSERIES_COMPAT_scanners-layer = "warrior" | 11 | LAYERSERIES_COMPAT_scanners-layer = "zeus" |
12 | 12 | ||
13 | LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" | 13 | LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" |
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf index cdccc55..3af2d95 100644 --- a/meta-tpm/conf/layer.conf +++ b/meta-tpm/conf/layer.conf | |||
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "tpm-layer" | |||
8 | BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_tpm-layer = "10" | 9 | BBFILE_PRIORITY_tpm-layer = "10" |
10 | 10 | ||
11 | LAYERSERIES_COMPAT_tpm-layer = "warrior" | 11 | LAYERSERIES_COMPAT_tpm-layer = "zeus" |
12 | 12 | ||
13 | LAYERDEPENDS_tpm-layer = " \ | 13 | LAYERDEPENDS_tpm-layer = " \ |
14 | core \ | 14 | core \ |