From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 04 Mar 2022 09:10:55 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nQ31b-00HMgG-P6 for lore@lore.pengutronix.de; Fri, 04 Mar 2022 09:10:55 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nQ31a-0001Mg-UI; Fri, 04 Mar 2022 09:10:54 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nQ31C-0001MG-Rl; Fri, 04 Mar 2022 09:10:30 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nQ31C-002ZFd-Cm; Fri, 04 Mar 2022 09:10:29 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nQ31A-00FhEO-PK; Fri, 04 Mar 2022 09:10:28 +0100 Date: Fri, 4 Mar 2022 09:10:28 +0100 From: Michael Olbrich To: Christian Melki , ptxdist@pengutronix.de Message-ID: Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20220303134028.GN12709@pengutronix.de> <7ee003fb-e6c3-34d7-d9e2-d29279369b0c@t2data.com> <9e421142-d037-6b62-79c4-2a7a9a09d120@benfm.de> <00ae8995-135e-dc67-737e-4c7d6ec3e08a@t2data.com> <20220303201138.GB26895@falbala.internal.home.lespocky.de> <20220303203533.GC26895@falbala.internal.home.lespocky.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220303203533.GC26895@falbala.internal.home.lespocky.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] Patch series for package per project? X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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