On Fri, May 8, 2026 at 4:09 PM Dmitry Baryshkov <[email protected]> wrote: > On Thu, May 07, 2026 at 05:40:18PM -0300, Ricardo Salveti wrote: > > 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 move it to u-boot-common.inc so it is applied > > consistently to both u-boot and u-boot-tools. > > > > Fixes: 5e97f3c1e2cf ("u-boot-tools: drop yaml in DT validation") > > Signed-off-by: Ricardo Salveti <[email protected]> > > --- > > meta/recipes-bsp/u-boot/u-boot-common.inc | 5 ++++- > > meta/recipes-bsp/u-boot/u-boot_2026.04.bb | 1 - > > 2 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc > > b/meta/recipes-bsp/u-boot/u-boot-common.inc > > index 574768b9f8..15e94a4e37 100644 > > --- a/meta/recipes-bsp/u-boot/u-boot-common.inc > > +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc > > @@ -14,7 +14,10 @@ PE = "1" > > # repo during parse > > SRCREV = "88dc2788777babfd6322fa655df549a019aa1e69" > > > > -SRC_URI = > > "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" > > +SRC_URI = "\ > > + > > git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV} > > \ > > + file://0001-scripts-dtc-drop-yaml-in-DT-validation.patch \ > > We are fetching the source basing on the PV. The patch might be > applicable or might not. I'd suggest listing the patch twice: in the > u-boot_2026.04.bb and u-boot-tools_2026.04.bb.
But the SRCREV is part of u-boot-common.inc, so it is aligned with it anyway (and it was also how patches were managed before here). If we move the patch it might be better to move everything related to the version used, and at that point we would end up duplicating most entries from it anyway. Cheers, Ricardo
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236739): https://lists.openembedded.org/g/openembedded-core/message/236739 Mute This Topic: https://lists.openembedded.org/mt/119204092/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
