[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7870/8267] kernel-fitimage: sanitize dtb section name (unbreak MIPS)



commit 34f9bcb8d5d1f9ac80c7b333da5e0eb006d68c72
Author: André Draszik <adraszik tycoint com>
Date:   Wed Sep 20 10:41:53 2017 +0100

    kernel-fitimage: sanitize dtb section name (unbreak MIPS)
    
    We can't build fitImages for MIPS any more:
    | Error: fit-image.its:21.27-28 syntax error
    | FATAL ERROR: Unable to parse input tree
    | uboot-mkimage: Can't read arch/mips/boot/fitImage.tmp: Invalid argument
    
    Since commit cd2ed7f80b555add07795cc0cbaee866e6c193a3
    ("kernel-fitimage: dtb sections named by their filenames
    and one config section for each dtb"), commit
    1ec405ef5df82884c8997878bbe6c66d924b5127 in yocto, dtb
    sections are named by the DTB filename, but the filename
    can legally be in a subdirectory below
    arch/$arch/boot/dts/, and on MIPS all DTBs are actually
    in a subdirectory.
    
    If so, mkimage fails with the above error message.
    
    Unbreak this by replacing the offending character
    (directory separator /)
    
    (From OE-Core rev: 335fc50cf54e47db4e3d5c35a9846484faf0270f)
    
    Signed-off-by: André Draszik <adraszik tycoint com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-fitimage.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2630b47..6f1b766 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -351,6 +351,7 @@ fitimage_assemble() {
                                DTB_PATH="arch/${ARCH}/boot/${DTB}"
                        fi
 
+                       DTB=$(echo "${DTB}" | tr '/' '_')
                        DTBS="${DTBS} ${DTB}"
                        fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
                done


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]