From 12c14ffc186b68ee79c9867778c22f4cd23c7d99 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 2 Oct 2023 09:26:10 +0200 Subject: [PATCH] nativesdk: add STM signtools to SDK The appropriate way to add STM signtools to the SDK is via RDEPENDS on nativesdk-packagegroup-sdk-host, not through the parent recipe of STM signtools recipe itself. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-8720 --- .../packagegroup/nativesdk-packagegroup-sdk-host.bbappend | 5 +++++ .../trustfence/nativesdk-trustfence-sign-tools_git.bb | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) 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 94b076552..bd339562f 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 @@ -10,7 +10,12 @@ IMX_TRUSTFENCE_SDK_TOOLS ?= " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'nativesdk-imx-mkimage', '', d)} \ " +STM_TRUSTFENCE_SDK_TOOLS ?= " \ + nativesdk-trustfence-stm-signtools \ +" + RDEPENDS:${PN} += " \ nativesdk-trustfence-sign-tools \ ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', '${IMX_OPTEE_SDK_RDEPENDS} ${IMX_TRUSTFENCE_SDK_TOOLS}', '', d)} \ + ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', '${STM_TRUSTFENCE_SDK_TOOLS}', '', d)} \ " diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb index e1f5f9ade..3d55e7a65 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb @@ -2,8 +2,3 @@ require trustfence-sign-tools.inc inherit nativesdk - -RDEPENDS:${PN} = " \ - ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'nativesdk-trustfence-cst', '', d)} \ - ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'nativesdk-trustfence-stm-signtools', '', d)} \ -"