summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2023-01-03 17:36:25 +0100
committerArmin Kuster <akuster808@gmail.com>2023-01-04 10:32:16 -0500
commit1550c126ce8bad2dfd91cdc1eea7c295ac7891bb (patch)
treeaae60b4fb7e8f40e4bd52a776223a186ece21b5c
parentf991b20f56de8cdf40556681e0e9276ae6b81cfa (diff)
downloadmeta-security-1550c126ce8bad2dfd91cdc1eea7c295ac7891bb.tar.gz
layer.conf: update LAYERSERIES_COMPAT for mickledore
* oe-core switched to mickedore in: https://git.openembedded.org/openembedded-core/commit/?id=57239d66b933c4313cf331d35d13ec2d0661c38f Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--conf/layer.conf2
-rw-r--r--meta-hardening/conf/layer.conf2
-rw-r--r--meta-integrity/conf/layer.conf2
-rw-r--r--meta-parsec/conf/layer.conf2
-rw-r--r--meta-security-compliance/conf/layer.conf2
-rw-r--r--meta-security-isafw/conf/layer.conf2
-rw-r--r--meta-tpm/conf/layer.conf2
7 files changed, 7 insertions, 7 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 470c7f6..b5a74f1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "security"
9BBFILE_PATTERN_security = "^${LAYERDIR}/" 9BBFILE_PATTERN_security = "^${LAYERDIR}/"
10BBFILE_PRIORITY_security = "8" 10BBFILE_PRIORITY_security = "8"
11 11
12LAYERSERIES_COMPAT_security = "kirkstone langdale" 12LAYERSERIES_COMPAT_security = "mickledore"
13 13
14LAYERDEPENDS_security = "core openembedded-layer" 14LAYERDEPENDS_security = "core openembedded-layer"
15 15
diff --git a/meta-hardening/conf/layer.conf b/meta-hardening/conf/layer.conf
index 5983161..add3cbc 100644
--- a/meta-hardening/conf/layer.conf
+++ b/meta-hardening/conf/layer.conf
@@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "harden-layer"
8BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/" 8BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/"
9BBFILE_PRIORITY_harden-layer = "10" 9BBFILE_PRIORITY_harden-layer = "10"
10 10
11LAYERSERIES_COMPAT_harden-layer = "kirkstone langdale" 11LAYERSERIES_COMPAT_harden-layer = "mickledore"
12 12
13LAYERDEPENDS_harden-layer = "core openembedded-layer" 13LAYERDEPENDS_harden-layer = "core openembedded-layer"
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
index 1fcf33c..b273b5b 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.
21OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" 21OE_TERMINAL_EXPORTS += "INTEGRITY_BASE"
22 22
23LAYERSERIES_COMPAT_integrity = "kirkstone langdale" 23LAYERSERIES_COMPAT_integrity = "mickledore"
24# ima-evm-utils depends on keyutils from meta-oe 24# ima-evm-utils depends on keyutils from meta-oe
25LAYERDEPENDS_integrity = "core openembedded-layer" 25LAYERDEPENDS_integrity = "core openembedded-layer"
26 26
diff --git a/meta-parsec/conf/layer.conf b/meta-parsec/conf/layer.conf
index a748d77..0a71694 100644
--- a/meta-parsec/conf/layer.conf
+++ b/meta-parsec/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "parsec-layer"
8BBFILE_PATTERN_parsec-layer = "^${LAYERDIR}/" 8BBFILE_PATTERN_parsec-layer = "^${LAYERDIR}/"
9BBFILE_PRIORITY_parsec-layer = "5" 9BBFILE_PRIORITY_parsec-layer = "5"
10 10
11LAYERSERIES_COMPAT_parsec-layer = "kirkstone langdale" 11LAYERSERIES_COMPAT_parsec-layer = "mickledore"
12 12
13LAYERDEPENDS_parsec-layer = "core clang-layer" 13LAYERDEPENDS_parsec-layer = "core clang-layer"
14BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec" 14BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec"
diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf
index ec57541..f07532c 100644
--- a/meta-security-compliance/conf/layer.conf
+++ b/meta-security-compliance/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "scanners-layer"
8BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" 8BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/"
9BBFILE_PRIORITY_scanners-layer = "10" 9BBFILE_PRIORITY_scanners-layer = "10"
10 10
11LAYERSERIES_COMPAT_scanners-layer = "kirkstone langdale" 11LAYERSERIES_COMPAT_scanners-layer = "mickledore"
12 12
13LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" 13LAYERDEPENDS_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 724742d..550cced 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
15LAYERDEPENDS_security-isafw = "core" 15LAYERDEPENDS_security-isafw = "core"
16 16
17LAYERSERIES_COMPAT_security-isafw = "kirkstone langdale" 17LAYERSERIES_COMPAT_security-isafw = "mickledore"
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf
index 1fd2e4c..81690ca 100644
--- a/meta-tpm/conf/layer.conf
+++ b/meta-tpm/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "tpm-layer"
8BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/" 8BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/"
9BBFILE_PRIORITY_tpm-layer = "10" 9BBFILE_PRIORITY_tpm-layer = "10"
10 10
11LAYERSERIES_COMPAT_tpm-layer = "kirkstone langdale" 11LAYERSERIES_COMPAT_tpm-layer = "mickledore"
12 12
13LAYERDEPENDS_tpm-layer = " \ 13LAYERDEPENDS_tpm-layer = " \
14 core \ 14 core \