Re: [yocto-patches] [meta-rockchip][PATCH] u-boot: Update SRCREV for radxa-zero-3

[Trevor Woerner <twoerner@gmail.com>]

On Mon 2024-12-09 @ 04:22:47 PM, Quentin Schulz wrote:
> Hi Oleksii,
> 
> On 12/7/24 5:23 PM, Oleksii Kurochko via lists.yoctoproject.org wrote:
> > [You don't often get email from oleksii.kurochko=gmail.com@lists.yoctoproject.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> > 
> > During the fetch stage of u-boot for radxa-zero-3, the following issue occurs:
> >    Unable to find revision 8cdf606e616baa36751f3b4adcfaefc781126c8c in branch
> >    rk3xxx-2024.07 even from upstream
> > 
> > This happens because the hash of the head commit for the rk3xxx-2024.07 branch
> > is different from the one specified in the recipe.
> > This can be verified by running the following command in
> > <yocto>/build/tmp/work/radxa_zero_3e-poky-linux/u-boot/2024.01/git:
> >    $ git rev-list -n 1 rk3xxx-2024.07
> >      2e2ae1fb69a25217640bfe2fb9abaf9f4fbacead
> > 
> > Update the SRCREV to the hash of the current head commit corresponding to
> > the rk3xxx-2024.07 branch.
> > 
> > Fixes: e0b13fe834b5("radxa-zero-3{e|w}: add")
> > Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> > ---
> >   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
> > index c939a48..9432e2b 100644
> > --- a/recipes-bsp/u-boot/u-boot_%.bbappend
> > +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
> > @@ -3,8 +3,8 @@ require u-boot-rockchip.inc
> >   FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
> > 
> >   SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
> > -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> > -SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> > +SRCREV:radxa-zero-3 = "2e2ae1fb69a25217640bfe2fb9abaf9f4fbacead"
> > +SRCREV:radxa-zero-3:rk-u-boot-env = "2e2ae1fb69a25217640bfe2fb9abaf9f4fbacead"
> > 
> 
> Master poky now has v2024.10 and at a glance it seems the Zero 3E/W is
> supported, so maybe we could simply ditch those overrides for master branch
> in meta-rockchip?

Yes, and it looks like it's time to also ditch the overrides for rk-u-boot-env
as well. When I added that recipe from Jonas, he warned me at that time that
switching to upstream would be a better option, but it worked, so I left it
for the time-being.

> Other release branches should probably get a fix similar to the one in this
> patch though. Or ideally just download the patches from that tree and apply
> them on top of v2024.07 for styhead (we would need a new release branch for
> that though). Scarthgap has v2024.01 so that's a bit too old to apply
> patches destined to 2024.07. But we could maybe point to v2024.07
> upstream+patches instead of pointing to Jonas (Kwiboo)'s personal git repo.
> 
> What do you think? Trevor, an opinion here?
> 
> Cheers,
> Quentin