Re: [OE-core] [PATCH] u-boot: set git repo branch with SRCBRANCH

[Mikko Rapeli <mikko.rapeli@linaro.org>]

Hi,

On Tue, Apr 08, 2025 at 10:00:05AM +0100, Richard Purdie wrote:
> On Fri, 2025-04-04 at 10:51 +0300, Mikko Rapeli via lists.openembedded.org wrote:
> > Enables changing branch from "master" to "next"
> > when building bleeding edge upstream versions for
> > testing purposes. Now local.conf setup to
> > build latest "next" version becomes:
> > 
> > INHERIT += "poky-bleeding"
> > POKY_AUTOREV_RECIPES += "u-boot"
> > SRCBRANCH:pn-u-boot = "next"
> > 
> > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> > ---
> > �meta/recipes-bsp/u-boot/u-boot-common.inc | 4 ++--
> > �1 file changed, 2 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 fc860248ed..9e96c46b74 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot-common.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
> > @@ -13,8 +13,8 @@ PE = "1"
> > �# We use the revision in order to avoid having to fetch it from the
> > �# repo during parse
> > �SRCREV = "6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72"
> > -
> > -SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
> > +SRCBRANCH ?= "master"
> > +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=${SRCBRANCH}"
> > �
> > �S = "${WORKDIR}/git"
> > �B = "${WORKDIR}/build"
> 
> I do want to be able to do this kind of thing,�so to be clear, I do
> strongly support the idea.
> 
> I am however worried about the implication of how this will scale (or
> not). If I merge this, I'm likely to get this change for many other
> recipes. I also suspect people will want to parameterise the
> "source.denx.de/u-boot/u-boot.git" url part too so they can use their
> own local repo.
> 
> I can't help wonder if we need some other mechanism for this. I've
> talked with Joshua about variable "filter" mecahnisms before which
> would be one idea. It would also be possible to filter the variable
> with some inline python magic, in much the same way that the code
> already tweaks SRCREV to add AUTOREV.
> 
> I did also wonder whether our mirror rewriting code could be used
> somehow...

So a variable for pokybleeding_version_handler() to rewrite
"branch" variable in SRC_URI?

That could work but at the moment outside of fetcher code.

Cheers,

-Mikko