Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0

[Robert Schwebel <r.schwebel@pengutronix.de>]

This should be resolved in next now.

rsc

On Fri, Jun 27, 2025 at 02:41:19PM +0200, Roland Hieber wrote:
> On Thu, Jun 26, 2025 at 11:03:19AM +0200, Roland Hieber wrote:
> > On Wed, Jun 25, 2025 at 07:38:21PM +0200, Robert Schwebel wrote:
> > > Could you rebase to next? This does not apply any more.
> > 
> > It looks to me like this patch is already fixed-up in commit c7a728d78d49
> > (upstream/next) Mo 2025-06-23 11:23:38 (Roland Hieber) "v7a: barebox: version
> > bump 2025.05.0 -> 2025.06.0". But the other one ("fixup! ptxdist: version bump
> > 2025.05 -> 2025.06") is not yet. However, if I rebase on top of c7a728d78d49, it
> > doesn't seem to change the patch content of that fixup. 
> > 
> > I've pushed my 'next' branch to ssh://public@git.pengutronix.de/rhi/DistroKit so
> > you could have a look if you want (Note that I also changed it from a "fixup!"
> > to a "squash!" so my additional log message doesn't get lost in rebasing).
> 
> I've sent the squashed version in
> https://lore.distrokit.org/distrokit/20250627123252.1985354-1-rhi@pengutronix.de/
> , it can be applied before c7a728d78d49 (current next branch) instead of
> 4e6825497be6.
> 
>  - Roland
> 
> > > On Wed, Jun 25, 2025 at 07:36:31PM +0200, Robert Schwebel wrote:
> > > > Applied & squashed into original patch in next.
> > > > 
> > > > On Wed, Jun 25, 2025 at 03:13:39PM +0200, Roland Hieber wrote:
> > > > > [rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs]
> > > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > > > ---
> > > > > Robert, can you squash this into my original patch? I didn't expect that
> > > > > it would be applied after Fabian's PTXdist 2025.06.0 update, which
> > > > > now writes two checksums in config diffs.
> > > > > 
> > > > >  - Roland
> > > > > 
> > > > >  configs/platform-v7a/barebox-at91.config.diff | 1 +
> > > > >  1 file changed, 1 insertion(+)
> > > > > 
> > > > > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
> > > > > index 162ed9f4791e..cf3de80f23f2 100644
> > > > > --- a/configs/platform-v7a/barebox-at91.config.diff
> > > > > +++ b/configs/platform-v7a/barebox-at91.config.diff
> > > > > @@ -1,4 +1,5 @@
> > > > >  0cb3165d3c2844da9a6d01e5407289ca
> > > > > +b2da2644182531b3b6a4a2c9ec7ff908
> > > > >  CONFIG_ARCH_AT91=y
> > > > >  # CONFIG_ARCH_BCM283X is not set
> > > > >  # CONFIG_ARCH_IMX is undefined
> > > > > -- 
> > > > > 2.39.5
> > > > > 
> > > > > 
> > > > > 
> > > > 
> > > > -- 
> > > > Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> > > > Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> > > > 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> > > > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> > > > 
> > > > 
> > > 
> > > -- 
> > > Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> > > Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> > > 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> > > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> > > 
> > 
> > -- 
> > Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
> > Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
> > 31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
> > Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |
> > 
> > 
> 
> -- 
> Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
> Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |