diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-05-08 12:47:42 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-05-14 07:56:52 -0700 |
commit | 1671f7d7e2111082609247558d17da4deb171b2a (patch) | |
tree | 79bfe62aa58703f5ece32e15cc82abbfd2dc2598 | |
parent | 6d7b18dc22247ca6235081281def435c23ba2204 (diff) | |
download | meta-security-1671f7d7e2111082609247558d17da4deb171b2a.tar.gz |
tpm2: package groups fixes
Signed-off-by: Armin Kuster <akuster808@gmail.com>
3 files changed, 18 insertions, 1 deletions
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" | |||
9 | 9 | ||
10 | SUMMARY_packagegroup-security-tpm-i2c = "Security TPM i2c support" | 10 | SUMMARY_packagegroup-security-tpm-i2c = "Security TPM i2c support" |
11 | RDEPENDS_packagegroup-security-tpm-i2c = " \ | 11 | RDEPENDS_packagegroup-security-tpm-i2c = " \ |
12 | ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'packagegroup-security-tpm', '', d)} \ | ||
13 | ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2, '', d)} \ | ||
12 | kernel-module-tpm-i2c-atmel \ | 14 | kernel-module-tpm-i2c-atmel \ |
13 | kernel-module-tpm-i2c-infineon \ | 15 | kernel-module-tpm-i2c-infineon \ |
14 | kernel-module-tpm-i2c-nuvoton \ | 16 | 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" | |||
11 | RDEPENDS_packagegroup-security-tpm = " \ | 11 | RDEPENDS_packagegroup-security-tpm = " \ |
12 | tpm-tools \ | 12 | tpm-tools \ |
13 | trousers \ | 13 | trousers \ |
14 | ${X86_TPM_MODULES} \ | ||
15 | " | ||
16 | |||
17 | X86_TPM_MODULES ?= "" | ||
18 | |||
19 | X86_TPM_MODULES_x86 = " \ | ||
20 | kernel-module-tpm-atmel \ | ||
21 | kernel-module-tpm-infineon \ | ||
22 | kernel-module-tpm-nsc \ | ||
23 | " | ||
24 | |||
25 | X86_TPM_MODULES_x86-64 = " \ | ||
26 | kernel-module-tpm-atmel \ | ||
27 | kernel-module-tpm-infineon \ | ||
28 | kernel-module-tpm-nsc \ | ||
14 | " | 29 | " |
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" | |||
10 | SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support" | 10 | SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support" |
11 | RDEPENDS_packagegroup-security-tpm2 = " \ | 11 | RDEPENDS_packagegroup-security-tpm2 = " \ |
12 | tpm2.0-tools \ | 12 | tpm2.0-tools \ |
13 | trousers \ | ||
13 | libtss2 \ | 14 | libtss2 \ |
14 | libtctidevice \ | 15 | libtctidevice \ |
15 | libtctisocket \ | 16 | libtctisocket \ |
16 | resourcemgr \ | 17 | resourcemgr \ |
17 | kernel-module-tpm-crb \ | ||
18 | " | 18 | " |