summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2017-10-06 13:12:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:39:47 +0000
commit637fec385a446de21a0be218099f6a16421e08fa (patch)
treeaf5e2b2ef2117f83e77caea9a32ffc06c0e2790c /meta/classes
parent8deaf6612a5fe520941540afd96e0cc07cb974e4 (diff)
downloadpoky-637fec385a446de21a0be218099f6a16421e08fa.tar.gz
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: feb78cb536a5e5cc9f1c36014b1a1ae1c147f45c) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 335fc50cf54e47db4e3d5c35a9846484faf0270f) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-fitimage.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2630b47316..6f1b7667bc 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -351,6 +351,7 @@ fitimage_assemble() {
351 DTB_PATH="arch/${ARCH}/boot/${DTB}" 351 DTB_PATH="arch/${ARCH}/boot/${DTB}"
352 fi 352 fi
353 353
354 DTB=$(echo "${DTB}" | tr '/' '_')
354 DTBS="${DTBS} ${DTB}" 355 DTBS="${DTBS} ${DTB}"
355 fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH} 356 fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
356 done 357 done