From 4859a49faf9dea0cf5039d81fbf898deb5467bb9 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 9 May 2017 07:36:11 -0700 Subject: layer-conf: Use *_FEATURES in LAYERDEPENDS Signed-off-by: Armin Kuster --- conf/layer.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 3502f0b..547a559 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,8 @@ BBFILE_COLLECTIONS += "security" BBFILE_PATTERN_security = "^${LAYERDIR}/" BBFILE_PRIORITY_security = "6" -LAYERDEPENDS_security = "openembedded-layer perl-layer networking-layer filesystems-layer" +LAYERDEPENDS_security = "core openembedded-layer perl-layer" +LAYERDEPENDS_security += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnome-layer xfce-layer", "", d)}" +LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm", "tpm-layer", "",d)}" +LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "tpm-layer", "",d)}" +LAYERDEPENDS_security += "${@bb.utils.contains("MACHINE_FEATURES", "vtpm", "tpm-layer mete-filesystems", "",d)}" -- cgit v1.2.3-54-g00ecf