From 437899bb95f1dcb49144465af32e4a94521bbab1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 20 Nov 2024 18:36:34 +0100 Subject: [PATCH] linux-trustfence.inc: use the correct DTB file for signing This commit in Poky: https://git.yoctoproject.org/poky/commit/?id=fbace4111441d36026c3b5cd2ef690250ca8c448 changed the naming/symlinking of the different dtb files installed in the deploy directory. In Yocto 4.0 we had: 146432 nov 19 14:37 ccimx8x-sbc-pro--5.15-r0.6-ccimx8x-sbc-pro-20241119124717.dtb 61 nov 19 14:37 ccimx8x-sbc-pro-ccimx8x-sbc-pro.dtb -> ccimx8x-sbc-pro--5.15-r0.6-ccimx8x-sbc-pro-20241119124717.dtb 61 nov 19 14:37 ccimx8x-sbc-pro.dtb -> ccimx8x-sbc-pro--5.15-r0.6-ccimx8x-sbc-pro-20241119124717.dtb while in Yocto 5.0: 19 nov 19 17:57 ccimx8x-sbc-pro--6.6-r0.0-ccimx8x-sbc-pro-20241119164948.dtb -> ccimx8x-sbc-pro.dtb 19 nov 19 17:57 ccimx8x-sbc-pro-ccimx8x-sbc-pro.dtb -> ccimx8x-sbc-pro.dtb 151552 nov 19 17:57 ccimx8x-sbc-pro.dtb Now, the regular file does not have timestamps or platform name suffixes, so adjust the signing code to reflect this change. https://onedigi.atlassian.net/browse/DEL-9325 Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc b/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc index 3b6d95c59..556024e3c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc @@ -39,7 +39,7 @@ trustfence_sign() { DTB=`normalize_dtb "${DTB}"` DTB_EXT=${DTB##*.} DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" + DTB_IMAGE="${DTB_BASE_NAME}.${DTB_EXT}" TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" if [ "${DTB_EXT}" = "dtbo" ]; then