From 68bad57b8c00d33b01a4fcb2170bed654f2ca7c1 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 7 May 2017 22:40:04 -0700 Subject: change tpm from distro to machine feature Signed-off-by: Armin Kuster --- meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend | 2 +- recipes-security/packagegroup/packagegroup-core-security.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend b/meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend index e6b3c65..208d23f 100644 --- a/meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend +++ b/meta-tpm/recipes-kernel/linux/linux-yocto_4.10.bbappend @@ -1,5 +1,5 @@ # # TPM kernel support -KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}" +KERNEL_FEATURES_append += "${@bb.utils.contains('MACHINE_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}" diff --git a/recipes-security/packagegroup/packagegroup-core-security.bb b/recipes-security/packagegroup/packagegroup-core-security.bb index ae856c7..2180908 100644 --- a/recipes-security/packagegroup/packagegroup-core-security.bb +++ b/recipes-security/packagegroup/packagegroup-core-security.bb @@ -11,7 +11,7 @@ PACKAGES = "\ packagegroup-security-scanners \ packagegroup-security-ids \ packagegroup-security-mac \ - ${@bb.utils.contains("DISTRO_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \ " RDEPENDS_packagegroup-core-security = "\ @@ -19,7 +19,7 @@ RDEPENDS_packagegroup-core-security = "\ packagegroup-security-scanners \ packagegroup-security-ids \ packagegroup-security-mac \ - ${@bb.utils.contains("DISTRO_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "tpm", "packagegroup-security-tpm", "",d)} \ " SUMMARY_packagegroup-security-utils = "Security utilities" -- cgit v1.2.3-54-g00ecf