diff mbox series

[BACKPORT] uboot-sign: fix concat_dtb arguments

Message ID 12abdca1-293e-4615-993d-6f8ccec3506b@gmail.com
State New
Headers show
Series [BACKPORT] uboot-sign: fix concat_dtb arguments | expand

Commit Message

Clayton Casciato Nov. 15, 2024, 2:25 a.m. UTC
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 <majortomtosourcecontrol@gmail.com>
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
    
    Signed-off-by: Clayton Casciato <majortomtosourcecontrol@gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Comments

Steve Sakoman Nov. 15, 2024, 2:14 p.m. UTC | #1
On Thu, Nov 14, 2024 at 6:25 PM Clayton Casciato
<majortomtosourcecontrol@gmail.com> wrote:
>
> 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

>
> Thank you!
>
> Clayton Casciato
>
> --
>
> commit b3c473785e5ceef677ff2b77c5fc17f5704c622f
> Author: Clayton Casciato <majortomtosourcecontrol@gmail.com>
> 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
>
>     Signed-off-by: Clayton Casciato <majortomtosourcecontrol@gmail.com>
>     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass
> index 3e5f5dcf66..a17be745ce 100644
> --- a/meta/classes-recipe/uboot-sign.bbclass
> +++ b/meta/classes-recipe/uboot-sign.bbclass
> @@ -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
diff mbox series

Patch

diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass
index 3e5f5dcf66..a17be745ce 100644
--- a/meta/classes-recipe/uboot-sign.bbclass
+++ b/meta/classes-recipe/uboot-sign.bbclass
@@ -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