From 7edf23a8adbce355a0e410b87dddb91578313de6 Mon Sep 17 00:00:00 2001 From: Klaus Heinrich Kiwi Date: Mon, 11 Jan 2021 20:26:30 +0000 Subject: meta-phosphor: Add ibmtpm2tss recipe to rainier and witherspoon-tacoma The ibmtpm2tss tools are required to use the Nuvoton NPCT750A TPM from userland. The ibmtpm2tss package also required OpenSSL camellia support, so remove the override disabling that for those two machines. Signed-off-by: Klaus Heinrich Kiwi Change-Id: Ifc0afc58f4a31ea4b6d1750d470738d0d0e82754 --- meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend | 3 ++- meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 4bcaf7544..433d58d68 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,5 +1,6 @@ OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname" -OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd ibmtpm2tss" +OBMC_IMAGE_EXTRA_INSTALL_append_witherspoon-tacoma = " ibmtpm2tss" OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller " # remove so things fit in available flash space diff --git a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend new file mode 100644 index 000000000..6ffe5db6c --- /dev/null +++ b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend @@ -0,0 +1,4 @@ +# Rainier needs ibmtpm2tss which needs ibmswtpm2 which needs openssl +# camellia support +EXTRA_OECONF_remove_witherspoon-tacoma = " no-camellia" +EXTRA_OECONF_remove_rainier = " no-camellia" -- cgit v1.2.3