Commit 5e97f3c1e2cf ("u-boot-tools: drop yaml in DT validation") added the
backport through SRC_URI_RISCV, so only RISC-V u-boot builds picked it up.
This issue is because the v1 of the patch was merged instead the v2 (which
is also not fully correct as it is not patching u-boot-tools). Drop the
patch from SRC_URI_RISCV and add it directly to both u-boot_2026.04.bb and
u-boot-tools_2026.04.bb, so it is applied to both recipes without
affecting external recipes including u-boot-common.inc.
Fixes: 5e97f3c1e2cf ("u-boot-tools: drop yaml in DT validation")
Signed-off-by: Ricardo Salveti <[email protected]>
---
v2:
- Add patch to both u-boot_2026.04.bb and u-boot-tools_2026.04.bb to avoid
breaking recipes including u-boot-common.inc.
meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb | 2 ++
meta/recipes-bsp/u-boot/u-boot_2026.04.bb | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb
b/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb
index 7eaf721ca8..6c3ef7efd1 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb
@@ -1,2 +1,4 @@
require u-boot-common.inc
require u-boot-tools.inc
+
+SRC_URI += "file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
b/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
index 9f09d91daa..92ced8079d 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2026.04.bb
@@ -3,6 +3,8 @@ require u-boot.inc
DEPENDS += "bc-native dtc-native gnutls-native python3-pyelftools-native"
+SRC_URI += "file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch"
+
# workarounds for aarch64 kvm qemu boot regressions
SRC_URI:append:qemuarm64 = " file://disable-CONFIG_BLOBLIST.cfg"
SRC_URI:append:genericarm64 = " file://disable-CONFIG_BLOBLIST.cfg"
@@ -14,7 +16,6 @@ SRC_URI_RISCV = "\
${@bb.utils.contains ("TUNE_FEATURES", "d",
"file://u-boot-riscv-isa_d.cfg", "", d)} \
${@bb.utils.contains_any("TUNE_FEATURES", "b zbb",
"file://u-boot-riscv-isa_zbb.cfg", "", d)} \
${@bb.utils.contains ("TUNE_FEATURES", "zicbom",
"file://u-boot-riscv-isa_zicbom.cfg", "", d)} \
- file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch \
"
SRC_URI:append:riscv32 = "${SRC_URI_RISCV}"
--
2.53.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#237376):
https://lists.openembedded.org/g/openembedded-core/message/237376
Mute This Topic: https://lists.openembedded.org/mt/119401150/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
