summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-fitimage.bbclass
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-12 11:33:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-14 13:07:23 +0000
commit36c879ca38d63c9664480521b2cca6d04f1a5c79 (patch)
tree6a063ea04ab25fda1b971c1b8a75462f8e9eb6a0 /meta/classes/kernel-fitimage.bbclass
parent318f69d632c5bee86dbcf77be39110582d481226 (diff)
downloadpoky-36c879ca38d63c9664480521b2cca6d04f1a5c79.tar.gz
kernel-fitimage: fix devicetree reproducibility
Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible. Fixes: 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE") (From OE-Core rev: 9e4a91b63dd8e0c1708da2ac7de461b35fb0b011) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-fitimage.bbclass')
-rw-r--r--meta/classes/kernel-fitimage.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index d1b8cdc1f0..72b05ff8d1 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -391,7 +391,7 @@ fitimage_assemble() {
391 391
392 if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then 392 if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
393 dtbcount=1 393 dtbcount=1
394 for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do 394 for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
395 DTB=$(echo "${DTB}" | tr '/' '_') 395 DTB=$(echo "${DTB}" | tr '/' '_')
396 DTBS="${DTBS} ${DTB}" 396 DTBS="${DTBS} ${DTB}"
397 fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}" 397 fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}"