Machines that have added subdirectires to the KERNEL_DEVICETREE recently, such as arm32 boards that were moved under subdirectories in Linux 6.5, will have that subdirectory in the node name of the FIT. This breaks existing systems that select a configuration in u-boot by it's name.
Strip off the directory component from the device tree to preserve compatibility. Signed-off-by: Joel Stanley <[email protected]> Signed-off-by: Ninad Palsule <[email protected]> --- meta/classes-recipe/kernel-fitimage.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 13e8947f09..7e30a5d47e 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -599,6 +599,11 @@ fitimage_assemble() { DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB" fi + # Strip off the path component from the filename + if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then + DTB=`basename $DTB` + fi + # Set the default dtb image if it exists in the devicetree. if [ ${FIT_CONF_DEFAULT_DTB} = $DTB ];then default_dtb_image=$(echo "$DTB" | tr '/' '_') -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188329): https://lists.openembedded.org/g/openembedded-core/message/188329 Mute This Topic: https://lists.openembedded.org/mt/101618199/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
