diff options
author | Armin Kuster <akuster808@gmail.com> | 2022-02-19 14:02:21 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-02-20 19:39:36 -0800 |
commit | 30a4227e3c5b47005dedb3f89299d933557b9209 (patch) | |
tree | bd97e06577c9faa914c22a8c93e41936386c3b67 | |
parent | a6fc2597b4137dd2d6255cb77e1b0442b1c90d80 (diff) | |
download | meta-security-30a4227e3c5b47005dedb3f89299d933557b9209.tar.gz |
layer.conf: Update to use kirkstone
Update the layers to use the kirkstone namespace. No compatibility is made
for honister due to the variable renaming.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-hardening/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-integrity/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-parsec/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-security-compliance/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-security-isafw/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-tpm/conf/layer.conf | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index ad9da56..1f83593 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -9,7 +9,7 @@ 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 = "honister" | 12 | LAYERSERIES_COMPAT_security = "kirkstone" |
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" |
15 | 15 | ||
diff --git a/meta-hardening/conf/layer.conf b/meta-hardening/conf/layer.conf index 1cd6f4f..bc33d97 100644 --- a/meta-hardening/conf/layer.conf +++ b/meta-hardening/conf/layer.conf | |||
@@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "harden-layer" | |||
8 | BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_harden-layer = "10" | 9 | BBFILE_PRIORITY_harden-layer = "10" |
10 | 10 | ||
11 | LAYERSERIES_COMPAT_harden-layer = "honister" | 11 | LAYERSERIES_COMPAT_harden-layer = "kirkstone" |
12 | 12 | ||
13 | LAYERDEPENDS_harden-layer = "core openembedded-layer" | 13 | LAYERDEPENDS_harden-layer = "core openembedded-layer" |
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf index e9446e6..3d58be4 100644 --- a/meta-integrity/conf/layer.conf +++ b/meta-integrity/conf/layer.conf | |||
@@ -20,7 +20,7 @@ INTEGRITY_BASE := '${LAYERDIR}' | |||
20 | # interactive shell is enough. | 20 | # interactive shell is enough. |
21 | OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" | 21 | OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" |
22 | 22 | ||
23 | LAYERSERIES_COMPAT_integrity = "honister" | 23 | LAYERSERIES_COMPAT_integrity = "kirkstone" |
24 | # ima-evm-utils depends on keyutils from meta-oe | 24 | # ima-evm-utils depends on keyutils from meta-oe |
25 | LAYERDEPENDS_integrity = "core openembedded-layer" | 25 | LAYERDEPENDS_integrity = "core openembedded-layer" |
26 | 26 | ||
diff --git a/meta-parsec/conf/layer.conf b/meta-parsec/conf/layer.conf index 2eeb71b..19900bb 100644 --- a/meta-parsec/conf/layer.conf +++ b/meta-parsec/conf/layer.conf | |||
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "parsec-layer" | |||
8 | BBFILE_PATTERN_parsec-layer = "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_parsec-layer = "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_parsec-layer = "5" | 9 | BBFILE_PRIORITY_parsec-layer = "5" |
10 | 10 | ||
11 | LAYERSERIES_COMPAT_parsec-layer = "honister" | 11 | LAYERSERIES_COMPAT_parsec-layer = "kirkstone" |
12 | 12 | ||
13 | LAYERDEPENDS_parsec-layer = "core clang-layer tpm-layer" | 13 | LAYERDEPENDS_parsec-layer = "core clang-layer tpm-layer" |
14 | BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec" | 14 | BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec" |
diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf index ec4fd47..7c07625 100644 --- a/meta-security-compliance/conf/layer.conf +++ b/meta-security-compliance/conf/layer.conf | |||
@@ -8,7 +8,7 @@ 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 = "honister" | 11 | LAYERSERIES_COMPAT_scanners-layer = "kirkstone" |
12 | 12 | ||
13 | LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" | 13 | LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" |
14 | 14 | ||
diff --git a/meta-security-isafw/conf/layer.conf b/meta-security-isafw/conf/layer.conf index 86b0d4b..e8cdc1b 100644 --- a/meta-security-isafw/conf/layer.conf +++ b/meta-security-isafw/conf/layer.conf | |||
@@ -14,4 +14,4 @@ LAYERVERSION_security-isafw = "1" | |||
14 | 14 | ||
15 | LAYERDEPENDS_security-isafw = "core" | 15 | LAYERDEPENDS_security-isafw = "core" |
16 | 16 | ||
17 | LAYERSERIES_COMPAT_security-isafw = "honister" | 17 | LAYERSERIES_COMPAT_security-isafw = "kirkstone" |
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf index b00dd3c..52e3ee0 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 = "honister" | 11 | LAYERSERIES_COMPAT_tpm-layer = "kirkstone" |
12 | 12 | ||
13 | LAYERDEPENDS_tpm-layer = " \ | 13 | LAYERDEPENDS_tpm-layer = " \ |
14 | core \ | 14 | core \ |