From ba035acb22d983740b39fc69dd627008c13feb78 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 27 Apr 2022 13:09:25 +0200 Subject: [PATCH] trustfence: add Trustfence tools in default toolchain In order to perform the standalone signature process, it was required to rebuild the Toolchain with Trustfence support enabled. CST source code is now available for downloading in the Digi FTP, so add Trustfence sign scripts and cst/srktool to the default toolchain for it to be used for standalone signature without rebuilding. Signed-off-by: Gonzalo Ruiz (cherry picked from commit 2c9b721fb9ce38dcd0034e22d95db6e0ee068955) Signed-off-by: Javier Viguera --- .../recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb | 2 +- .../packagegroup/nativesdk-packagegroup-sdk-host.bbappend | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb index 4a5f896ef..e7057c573 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst_3.3.1.bb @@ -16,7 +16,7 @@ DEPENDS = "openssl byacc flex" DEPENDS:append:class-nativesdk = " byacc-native openssl-native" SRC_URI = " \ - ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', '${DIGI_PKG_SRC}/cst-${PV}.tgz', '', d)} \ + ${DIGI_PKG_SRC}/cst-${PV}.tgz \ file://0001-gen_auth_encrypted_data-reuse-existing-DEK-file.patch \ file://0002-hab4_pki_tree.sh-automate-script.patch \ file://0003-openssl_helper-use-dev-urandom-as-seed-source.patch \ diff --git a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend index b2a97d54b..c3dba749c 100644 --- a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend @@ -7,6 +7,6 @@ TRUSTFENCE_SDK_TOOLS ?= "\ " RDEPENDS:${PN} += " \ - ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', \ - oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', '${TRUSTFENCE_SDK_TOOLS} nativesdk-imx-mkimage', '${TRUSTFENCE_SDK_TOOLS}', d), '', d)} \ + ${TRUSTFENCE_SDK_TOOLS} \ + ${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'nativesdk-imx-mkimage', '', d)} \ "