[Buildroot] [PATCH] linux: add support for vendor dirs for appended DTBs

[Buildroot] [PATCH] linux: add support for vendor dirs for appended DTBs

[Alexander Sverdlin]

Take the basename of the appended DTBs to workaround the following problem:

(cd .../arch/arm/boot; for dtb in cirrus/ep93xx-edb9302
 do if test -e ${dtb}.dtb ; then dtbpath=${dtb}.dtb
 else dtbpath=dts/${dtb}.dtb ; fi
 cat zImage ${dtbpath} > zImage.${dtb} || exit 1; done)
/bin/sh: line 1: zImage.cirrus/ep93xx-edb9302: No such file or directory

Necessary to support ARM Linux starting from commit 724ba6751532
("ARM: dts: Move .dts files to vendor sub-directories"), i.e. Linux v6.4+.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
---
 linux/linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 1c4fe45ac9..1db5c6046d 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -468,7 +468,7 @@ define LINUX_APPEND_DTB
 			else \
 				dtbpath=dts/$${dtb}.dtb ; \
 			fi ; \
-			cat zImage $${dtbpath} > zImage.$${dtb} || exit 1; \
+			cat zImage $${dtbpath} > zImage.$$(basename $${dtb}) || exit 1; \
 		done)
 endef
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
-- 
2.41.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] linux: add support for vendor dirs for appended DTBs

[Thomas Petazzoni via buildroot]

On Fri,  7 Jul 2023 00:26:07 +0200
Alexander Sverdlin <alexander.sverdlin@gmail.com> wrote:

> Take the basename of the appended DTBs to workaround the following problem:
> 
> (cd .../arch/arm/boot; for dtb in cirrus/ep93xx-edb9302
>  do if test -e ${dtb}.dtb ; then dtbpath=${dtb}.dtb
>  else dtbpath=dts/${dtb}.dtb ; fi
>  cat zImage ${dtbpath} > zImage.${dtb} || exit 1; done)
> /bin/sh: line 1: zImage.cirrus/ep93xx-edb9302: No such file or directory
> 
> Necessary to support ARM Linux starting from commit 724ba6751532
> ("ARM: dts: Move .dts files to vendor sub-directories"), i.e. Linux v6.4+.
> 
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> ---
>  linux/linux.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot