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

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

On Fri, Mar 04, 2022 at 04:16:23PM +0100, Christian Melki wrote:
> On 3/4/22 9:10 AM, Michael Olbrich wrote:
> > 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.
> > 
> 
> Hm. My ptxdist setup seems to point to the bin/patches before
> projects/projectname/patches directory if i print the PATH_PATCHES variable.
> Default afaik?
> 
> And it doesn't continue if patches are available in some other directory.
> So if I have generic patches in bin/patches, or if I want them overridden it
> won't work?
> 
> I must have missed something? How is this supposed to work?

So I'm not sure, what you mean by bin/patches and
projects/projectname/patches, so I'll explain the search order in general.

I'll refer to the Toplevel directory of the BSP as 'bsp/'. That's the
directory you're in when ptxdist is called. Then there is the directory
where your platformconfig is located. That's typically
'bsp/configs/platform-foo/'. And of course there is PTXdist itself. I'll
use 'ptxdist/' for that.

When ptxdist searches for patches then it goes through a list of
directories and picks the first one that's found. For historical reasons
the order looks like this (for package bar-1.0):

bsp/patches/bar-1.0/
bsp/configs/platform-foo/patches/bar-1.0/

And if there are any layers:

base/bsp/patches/bar-1.0/
base/bsp/configs/platform-foo/patches/bar-1.0/

Repeat this by adding another base/ in each loop.
And finally:

ptxdist/patches/bar-1.0/

So if you want a default patch stack for multiple platforms, then put the
default in base/bsp/patches/bar-1.0/. Then you can overwrite it in on
platform with bsp/configs/platform-foo/patches/bar-1.0/.

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