Skip to contentSkip to conversation

uboot-sign: fix concat_dtb arguments

BACKPORT Clayton Casciato 2 participants 2 messages Nov 15, 2024

lore
Share & tools
lore
#0 lore raw

Hi, Steve!

I would like to backport this from master to Styhead and Scarthgap.

Please let me know if there's a better format to request this.

Thank you!

Clayton Casciato

--

commit b3c473785e5ceef677ff2b77c5fc17f5704c622f

Author: Clayton Casciato <[email protected]>
Date:   Thu Nov 7 10:10:47 2024 -0700

uboot-sign: fix concat_dtb arguments

Fixes [YOCTO #15642]

Ensure empty argument passed from do_uboot_assemble_fitimage is passed to concat_dtb

meta/classes-recipe/uboot-sign.bbclass +1 -1
index 3e5f5dcf66..a17be745ce 100644
@@ -338,7 +338,7 @@ uboot_assemble_fitimage_helper() {
 	binary="$2"
 
 	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then
-		concat_dtb $type $binary
+		concat_dtb "$type" "$binary"
 	fi
 
 	if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then
#1 lore raw
Quoted 6 lines · Clayton Casciato

Hi, Steve!

I would like to backport this from master to Styhead and Scarthgap.

Please let me know if there's a better format to request this.

No, this is fine. I have added it to my test queue for scarthgap and styhead.

Steve

Quoted 34 lines

Thank you!

Clayton Casciato

--

commit b3c473785e5ceef677ff2b77c5fc17f5704c622f

Author: Clayton Casciato <[email protected]>
Date:   Thu Nov 7 10:10:47 2024 -0700

uboot-sign: fix concat_dtb arguments

Fixes [YOCTO #15642]

Ensure empty argument passed from do_uboot_assemble_fitimage is passed to concat_dtb

meta/classes-recipe/uboot-sign.bbclass +1 -1
index 3e5f5dcf66..a17be745ce 100644
@@ -338,7 +338,7 @@ uboot_assemble_fitimage_helper() {
        binary="$2"
 
        if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then
-               concat_dtb $type $binary
+               concat_dtb "$type" "$binary"
        fi
 
        if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then