On Fri, May 8, 2026 at 11:35 AM Quentin Schulz <[email protected]> wrote: > > Hi Ricardo, > > On 5/7/26 10:40 PM, Ricardo Salveti via lists.openembedded.org 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 \ > > +" > > > > This means any recipe including recipes-bsp/u-boot/u-boot-common.inc > will need to override SRC_URI in addition to SRCREV otherwise the patch > may not apply. > > Wondering if we should move SRCREV and that patch into a > > u-boot-2026.04.inc > > which we can then include from > meta/recipes-bsp/u-boot/u-boot-tools_2026.04.bb > meta/recipes-bsp/u-boot/u-boot_2026.04.bb > > with > require u-boot-${PV}.inc
u-boot-common.inc is really minimal and mostly just to add the common homepage, license, srcrev and src_uri, so not sure if other variants should really be including it (e.g. LIC_FILES_CHKSUM could as well change based on the base version used). If we move SRCREV and SRC_URI to another common include file then u-boot-common.inc will just be used to share non-critical variables, which should probably also be customized by other alternatives (e.g. HOMEPAGE could be different). So not sure if this would help much. Thanks, Ricardo
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236729): https://lists.openembedded.org/g/openembedded-core/message/236729 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]] -=-=-=-=-=-=-=-=-=-=-=-
