summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-11 17:01:26 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 08:18:28 -0700
commitf1e482a498b0f6b41f23d661c3278fe4d63d8bd7 (patch)
tree50863fc60fd107cb9e5cf767da3aa4dafd169f83
parent8f6969a775fa6afbf553e72ba83e71197780b2d8 (diff)
downloadmeta-security-f1e482a498b0f6b41f23d661c3278fe4d63d8bd7.tar.gz
meta-*: add LAYERSERIES_COMPAT to layer.conf files
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--conf/layer.conf2
-rw-r--r--meta-security-compliance/conf/layer.conf2
-rw-r--r--meta-tpm/conf/layer.conf2
3 files changed, 6 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 7218560..04605a1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,6 +9,8 @@ BBFILE_COLLECTIONS += "security"
9BBFILE_PATTERN_security = "^${LAYERDIR}/" 9BBFILE_PATTERN_security = "^${LAYERDIR}/"
10BBFILE_PRIORITY_security = "6" 10BBFILE_PRIORITY_security = "6"
11 11
12LAYERSERIES_COMPAT_security = "sumo"
13
12LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python" 14LAYERDEPENDS_security = "core openembedded-layer perl-layer networking-layer meta-python"
13LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm", "tpm-layer", "",d)}" 15LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm", "tpm-layer", "",d)}"
14LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "tpm-layer", "",d)}" 16LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "tpm-layer", "",d)}"
diff --git a/meta-security-compliance/conf/layer.conf b/meta-security-compliance/conf/layer.conf
index 68d5528..31716d6 100644
--- a/meta-security-compliance/conf/layer.conf
+++ b/meta-security-compliance/conf/layer.conf
@@ -8,6 +8,8 @@ BBFILE_COLLECTIONS += "scanners-layer"
8BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" 8BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/"
9BBFILE_PRIORITY_scanners-layer = "6" 9BBFILE_PRIORITY_scanners-layer = "6"
10 10
11LAYERSERIES_COMPAT_scanners-layer = "sumo"
12
11LAYERDEPENDS_scanners-layer = " \ 13LAYERDEPENDS_scanners-layer = " \
12 core \ 14 core \
13" 15"
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf
index 36486d1..a2f0cab 100644
--- a/meta-tpm/conf/layer.conf
+++ b/meta-tpm/conf/layer.conf
@@ -8,6 +8,8 @@ BBFILE_COLLECTIONS += "tpm-layer"
8BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/" 8BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/"
9BBFILE_PRIORITY_tpm-layer = "6" 9BBFILE_PRIORITY_tpm-layer = "6"
10 10
11LAYERSERIES_COMPAT_tpm-layer = "sumo"
12
11LAYERDEPENDS_tpm-layer = " \ 13LAYERDEPENDS_tpm-layer = " \
12 core \ 14 core \
13" 15"