From 1671f7d7e2111082609247558d17da4deb171b2a Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 8 May 2017 12:47:42 -0700 Subject: tpm2: package groups fixes Signed-off-by: Armin Kuster --- .../packagegroup/packagegroup-security-tpm-i2c.bb | 2 ++ .../packagegroup/packagegroup-security-tpm.bb | 15 +++++++++++++++ .../packagegroup/packagegroup-security-tpm2.bb | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb b/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb index d4c3bb7..d3d9ebc 100644 --- a/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb +++ b/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb @@ -9,6 +9,8 @@ PACKAGES = "packagegroup-security-tpm-i2c" SUMMARY_packagegroup-security-tpm-i2c = "Security TPM i2c support" RDEPENDS_packagegroup-security-tpm-i2c = " \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'packagegroup-security-tpm', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2, '', d)} \ kernel-module-tpm-i2c-atmel \ kernel-module-tpm-i2c-infineon \ kernel-module-tpm-i2c-nuvoton \ diff --git a/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb b/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb index 2412348..2db8521 100644 --- a/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb +++ b/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb @@ -11,4 +11,19 @@ SUMMARY_packagegroup-security-tpm = "Security TPM support" RDEPENDS_packagegroup-security-tpm = " \ tpm-tools \ trousers \ + ${X86_TPM_MODULES} \ + " + +X86_TPM_MODULES ?= "" + +X86_TPM_MODULES_x86 = " \ + kernel-module-tpm-atmel \ + kernel-module-tpm-infineon \ + kernel-module-tpm-nsc \ + " + +X86_TPM_MODULES_x86-64 = " \ + kernel-module-tpm-atmel \ + kernel-module-tpm-infineon \ + kernel-module-tpm-nsc \ " diff --git a/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb b/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb index 1c96cbe..57b0722 100644 --- a/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb +++ b/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb @@ -10,9 +10,9 @@ PACKAGES = "packagegroup-security-tpm2" SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support" RDEPENDS_packagegroup-security-tpm2 = " \ tpm2.0-tools \ + trousers \ libtss2 \ libtctidevice \ libtctisocket \ resourcemgr \ - kernel-module-tpm-crb \ " -- cgit v1.2.3-54-g00ecf