Skip to contentSkip to conversation

kernel-fitimage: fix devicetree reproducibility

PATCH In review Alex Kiernan 2 participants 3 messages Feb 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")

---

 meta/classes/kernel-fitimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel-fitimage.bbclass +1 -1
index d1b8cdc1f049..72b05ff8d1dd 100644
@@ -391,7 +391,7 @@ fitimage_assemble() {
 
 	if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
 		dtbcount=1
-		for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do
+		for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
 			DTB=$(echo "${DTB}" | tr '/' '_')
 			DTBS="${DTBS} ${DTB}"
 			fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}"
Signature · 1 line
2.17.1
#1 lore raw

✗ patchtest: failure for kernel-fitimage: fix devicetree reproducibility

== Series Details ==

Series: kernel-fitimage: fix devicetree reproducibility
Revision: 1
URL : https://patchwork.openembedded.org/series/22582/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 44a4ac2294)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw
In reply to Alex Kiernan
Quoted 8 lines · Alex Kiernan

Ensure that the order of dtb/dtbo files in the generated fitimage is reproducible.

Fixes 71bfa9838cbf ("kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE")

---

I'd not realised the previous change was still in master-next. I'll squash this one into that.

Signature · 1 line
Alex Kiernan