diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-02-17 00:49:18 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-02-23 18:46:44 +0300 |
| commit | 9915b6fe33250e72244fbdfa83ae89d900b78ebb (patch) | |
| tree | c01e0e8ebf235a2029eeb23545399589d8f779c1 | |
| parent | 4e533685b272a21b62b92fb0b5c7ca994acdb891 (diff) | |
| download | openbmc-9915b6fe33250e72244fbdfa83ae89d900b78ebb.tar.xz | |
meta-phosphor: packagegroup-security: remove tpm2-pkcs11
We don't need pkcs11 support on the BMC by default and it ends up
causing a dependency chain that brings in Rust.
This packagegroup can only be pulled in when meta-security/meta-tpm is
used, so hook into BBFILES_DYNAMIC to use it when appropriate.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iff12f641e57ace313ad64a402091444edba74ea4
| -rw-r--r-- | meta-phosphor/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-phosphor/dynamic-layers/tpm-layer/recipes-core/packagegroups/packagegroup-security-tpm2.bbappend | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index 28d17d5fb9..460029160e 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -17,4 +17,6 @@ BBFILES_DYNAMIC += " \ aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bbappend \ nuvoton-layer:${LAYERDIR}/dynamic-layers/nuvoton-layer/recipes-*/*/*.bb \ nuvoton-layer:${LAYERDIR}/dynamic-layers/nuvoton-layer/recipes-*/*/*.bbappend \ + tpm-layer:${LAYERDIR}/dynamic-layers/tpm-layer/recipes-*/*/*.bb \ + tpm-layer:${LAYERDIR}/dynamic-layers/tpm-layer/recipes-*/*/*.bbappend \ " diff --git a/meta-phosphor/dynamic-layers/tpm-layer/recipes-core/packagegroups/packagegroup-security-tpm2.bbappend b/meta-phosphor/dynamic-layers/tpm-layer/recipes-core/packagegroups/packagegroup-security-tpm2.bbappend new file mode 100644 index 0000000000..06774b707c --- /dev/null +++ b/meta-phosphor/dynamic-layers/tpm-layer/recipes-core/packagegroups/packagegroup-security-tpm2.bbappend @@ -0,0 +1,3 @@ +# We don't need pkcs11 support on the BMC by default and it ends up causing a +# dependency chain that brings in Rust. +RDEPENDS:packagegroup-security-tpm2:remove = "tpm2-pkcs11" |