Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hector Palacios 2023-05-08 16:50:52 +02:00
parent 090c4f6616
commit 3229e37e88
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
View File

@ -6,11 +6,11 @@ IMX_OPTEE_SDK_RDEPENDS ?= " \
" "
IMX_TRUSTFENCE_SDK_TOOLS ?= " \ IMX_TRUSTFENCE_SDK_TOOLS ?= " \
nativesdk-trustfence-sign-tools \
nativesdk-trustfence-cst \ nativesdk-trustfence-cst \
${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'nativesdk-imx-mkimage', '', d)} \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'nativesdk-imx-mkimage', '', d)} \
" "
RDEPENDS:${PN} += " \ 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', 'NXP', '${IMX_OPTEE_SDK_RDEPENDS} ${IMX_TRUSTFENCE_SDK_TOOLS}', '', d)} \
" "

4
meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb
View File

@ -3,4 +3,6 @@
require trustfence-sign-tools.inc require trustfence-sign-tools.inc
inherit nativesdk inherit nativesdk
RDEPENDS:${PN} = "nativesdk-trustfence-cst" RDEPENDS:${PN} = " \
${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'nativesdk-trustfence-cst', '', d)} \
"

8
meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_git.bb
View File

@ -3,5 +3,9 @@
require trustfence-sign-tools.inc require trustfence-sign-tools.inc
inherit native inherit native
RDEPENDS:${PN} = "trustfence-cst-native coreutils-native util-linux-native" RDEPENDS:${PN} = " \
RDEPENDS:${PN} += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage-native', '', d)}" ${@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)} \
"

7
meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
View File

@ -1,10 +1,13 @@
# Copyright (C) 2016, 2017 Digi International Inc. # Copyright (C) 2016-2023 Digi International Inc.
SUMMARY = "Recovery initramfs files" SUMMARY = "Recovery initramfs files"
LICENSE = "GPL-2.0-only" LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" 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 = " \ SRC_URI = " \
file://recovery-initramfs-init \ file://recovery-initramfs-init \

5
meta-digi-dey/recipes-digi/dualboot/dualboot.bb
View File

@ -5,7 +5,10 @@ SECTION = "base"
LICENSE = "GPL-2.0-only" LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" 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 = " \ SRC_URI = " \
file://dualboot-init \ file://dualboot-init \