From 4890a5e12471b132c8cc33ebab386637dc265745 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 29 Jul 2017 16:06:06 -0700 Subject: [PATCH] layer: remove TPM layer depends and other dynamic ones. include meta-python for AppArmor changes Signed-off-by: Armin Kuster --- conf/layer.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 0e524a1..0b066fd 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,8 +9,4 @@ BBFILE_COLLECTIONS += "security" BBFILE_PATTERN_security = "^${LAYERDIR}/" BBFILE_PRIORITY_security = "6" -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 meta-filesystems", "",d)}" +LAYERDEPENDS_security = "core openembedded-layer perl-layer meta-python"