From 3229e37e8894182607eb30b79b7f25c3e70378d7 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Mon, 8 May 2023 16:50:52 +0200
Subject: [PATCH] trustfence-sign-tools: make dependency of cst-tool
 NXP-specific

While on it, merge the two RDEPENDS assignments in one.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../packagegroup/nativesdk-packagegroup-sdk-host.bbappend | 2 +-
 .../trustfence/nativesdk-trustfence-sign-tools_git.bb     | 4 +++-
 .../trustfence/trustfence-sign-tools-native_git.bb        | 8 ++++++--
 meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb | 7 +++++--
 meta-digi-dey/recipes-digi/dualboot/dualboot.bb           | 5 ++++-
 5 files changed, 19 insertions(+), 7 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 14d933030..94b076552 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
@@ -6,11 +6,11 @@ IMX_OPTEE_SDK_RDEPENDS ?= " \
 "
 
 IMX_TRUSTFENCE_SDK_TOOLS ?= " \
-    nativesdk-trustfence-sign-tools \
     nativesdk-trustfence-cst \
     ${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'nativesdk-imx-mkimage', '', d)} \
 "
 
 RDEPENDS:${PN} += " \
+    nativesdk-trustfence-sign-tools \
     ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', '${IMX_OPTEE_SDK_RDEPENDS} ${IMX_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 e388cac96..43e98b90b 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
@@ -3,4 +3,6 @@
 require trustfence-sign-tools.inc
 inherit nativesdk
 
-RDEPENDS:${PN} = "nativesdk-trustfence-cst"
+RDEPENDS:${PN} = " \
+    ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'nativesdk-trustfence-cst', '', d)} \
+"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_git.bb
index b83b56258..e17249f7b 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_git.bb
@@ -3,5 +3,9 @@
 require trustfence-sign-tools.inc
 inherit native
 
-RDEPENDS:${PN} = "trustfence-cst-native coreutils-native util-linux-native"
-RDEPENDS:${PN} += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage-native', '', d)}"
+RDEPENDS:${PN} = " \
+    ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'trustfence-cst-native', '', d)} \
+    coreutils-native \
+    util-linux-native \
+    ${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage-native', '', d)} \
+"
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
index 03e121515..7c1a27bcd 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
@@ -1,10 +1,13 @@
-# Copyright (C) 2016, 2017 Digi International Inc.
+# Copyright (C) 2016-2023 Digi International Inc.
 
 SUMMARY = "Recovery initramfs files"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'openssl-native trustfence-cst-native', '', d)}"
+SOC_SIGN_DEPENDS = " \
+    ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'trustfence-cst-native', '', d)} \
+"
+DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'openssl-native ${SOC_SIGN_DEPENDS}', '', d)}"
 
 SRC_URI = " \
     file://recovery-initramfs-init \
diff --git a/meta-digi-dey/recipes-digi/dualboot/dualboot.bb b/meta-digi-dey/recipes-digi/dualboot/dualboot.bb
index 5437eadd1..3d197fb2e 100644
--- a/meta-digi-dey/recipes-digi/dualboot/dualboot.bb
+++ b/meta-digi-dey/recipes-digi/dualboot/dualboot.bb
@@ -5,7 +5,10 @@ SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'openssl-native trustfence-cst-native', '', d)}"
+SOC_SIGN_DEPENDS = " \
+    ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'trustfence-cst-native', '', d)} \
+"
+DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'openssl-native ${SOC_SIGN_DEPENDS}', '', d)}"
 
 SRC_URI = " \
     file://dualboot-init \