Re: [ptxdist] Patch series for package per project?

[Michael Olbrich <m.olbrich@pengutronix.de>]

Hi,

On Thu, Mar 03, 2022 at 09:35:36PM +0100, Alexander Dahl wrote:
> On Thu, Mar 03, 2022 at 09:11:39PM +0100, Alexander Dahl wrote:
> > On Thu, Mar 03, 2022 at 08:37:45PM +0100, Christian Melki wrote:
> > > On 3/3/22 18:07, Felix Mellmann wrote:
> > > > On 03.03.22 15:22, Christian Melki wrote:
> > > >> Just one barebox version, but for different archs, with different 
> > > >> patchsets. I'd like the patches to live in the same place as they've 
> > > >> always done, i.e. under patches/package/...
> > > >> But patches/package/series.$platform or similar does not seem to work?
> > > >>
> > > > Would it be an option to put the patches below each of the platformdirs?
> > > > 
> > > > I ran into a similiar situation when starting to migrate to a different 
> > > > CPU platform. After a couple of years putting serveral "platformconfig" 
> > > > files within the same directory as "ptxconfig" I'm now using separate 
> > > > subdirs for each platform where separate sets of platform dependent 
> > > > patches are lying.

That would be my first suggestion as well.

> > > Ideally not. It irks me a bit that patches have to go to a different
> > > place because they belong to another platform than the "default". Or
> > > that they have to go somewhere else altogether because they need to be
> > > split into platforms.
> > > It doesn't make much sense to me.

I guess that's a matter of perspective. For me, either the patch stack is
shared. Then I out it in the common directory. Or each platform has a
completely separate patch stack. Then it feels natural to have them in
separate locations in each platform.

> > If I understand you correctly, your folder patches/barebox-2022.03.0
> > (or whatever common version you use) must look like this somehow, all
> > patches of the different series interleaved?
> > 
> > 0001-apples.patch
> > 0001-foo.patch
> > 0001-this.patch
> > 0002-bar.patch
> > 0002-oranges.patch
> > 0002-that.patch
> > 0003-baz.patch
> > series.one
> > series.three
> > series.two
> 
> Now, what if those series are not mutually exclusive, but certain
> patches are part of multiple series?  Even worse: in different places,
> like first patch in one, and third patch in the other series?  Each
> call of `git ptx-patches` would change the file numbers in the file
> names, breaking the other series?

Exactly. Maintaining shared patches is a mess. When I have more patches and
especially if they are shared, then I work with a clone of the package
upstream git. I use 'ptxdist local-src' for development and then export a
full patch stack into the BSP.
If the patch stacks for multiple platforms share some patches then they are
in a shared branch in git, but in the BSP each platform has its own copy.


> > Seriously, that looks messy to me, how should anyone looking at the
> > directory know which patch belongs to which series without looking at
> > the series files?  What if someone wants to copy/move all patches
> > belonging to only one series to a different place?
> 
> What I would do, and in fact I did this with patches for U-Boot for
> five different boards: throw all patches into one series.  Why
> separate them?  Or if that's not possible, put distinct patch series
> configs/platform-XXX/patches/barebox-2022.03.0 as suggested before.

I personally don't like having unrelated and unnecessary patches in my
patchstack...

> Well, there's one more possibility: put the patch series to different
> top layers. ;-)

You could also put something like this in platforms/barebox-series.in:

config BAREBOX_SERIES
	string
	default "series${PTXDIST_PLATFORMSUFFIX}"

This will be used automatically and you have a series for each platform.
Or add a prompt and explicitly set the series filename.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de