public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Leif Lindholm" <leif.lindholm@linaro.org>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>, Pete Batard <pete@akeo.ie>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	edk2-devel-groups-io <devel@edk2.groups.io>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/1] Platforms/RPi3: Restructure platform in preparation for Pi 4
Date: Mon, 21 Oct 2019 14:46:28 +0100	[thread overview]
Message-ID: <20191021134628.GC16820@bivouac.eciton.net> (raw)
In-Reply-To: <CAKv+Gu-AuyCv4z6+UvnumCjpYuRoqwZKUy2hQ76=H+ny7HowUA@mail.gmail.com>

On Mon, Oct 21, 2019 at 03:24:47PM +0200, Ard Biesheuvel wrote:
> On Mon, 21 Oct 2019 at 15:09, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> >
> > On 10/21/19 2:52 PM, Pete Batard wrote:
> > > Hi Philippe,
> > >
> > > On 2019.10.21 13:28, Philippe Mathieu-Daudé wrote:
> > >> Hi Pete,
> > >>
> > >> On 10/21/19 1:25 PM, Pete Batard wrote:
> > >>> In preparation for adding Raspberry Pi 4 support, the Pi 3 platform
> > >>> is restructured by factorizing all the drivers and libraries that are
> > >>> going to be commonly used by the two platforms.
> > >>>
> > >>> Because much of the Pi 4 SoC is an extension of the Pi 3 one this
> > >>> means that almost everything, except the ACPI tables, is moved up
> > >>> into a new common RaspberryPi/ subdirectory that will serve both
> > >>> platforms. The .dec is also moved to this directory, under a new
> > >>> RaspberryPi.dec name, and existing references to it are updated.
> > >>>
> ...
> > >>
> > >> This change seems not related to the rest of your refactor.
> > >
> > > It is. See https://edk2.groups.io/g/devel/message/49288
> > >
> > > The problem is we have no choice but to break the patch in two sections,
> > > one that applies to edk2-platforms and the other to edk2-non-osi, since
> > > these are separate repos, and the LogoDxe changes belong to non-osi.
> > >
> > > We need to have part of the non-osi patch that is applied to
> > > edk2-platforms, and it would make little sense to break it down into the
> > > non-osi related and platforms related, since it still relies on the
> > > non-osi changes having been applied.
> >
> > I see.
> >
> > >
> > > If anything, I guess we could consider that the non-osi patch should
> > > come first. Still, whatever we do here, as long as only one of non-osi
> > > and platform is applied, builds are going to be broken, and there is no
> > > way to fix that unless you do consider the set of platforms + non-osi as
> > > a single patch.
> >
> > Agreed, this is a egg/chicken problem.
> >
> 
> I dealt with this in the past by just making sure the non-osi and
> platform changes are applied at the same time. So it is good to make
> note of this in the cover letter, but other than that, there is no way
> we can apply interdependent changes to two separate repositories at
> the same time without either breaking bisect for one of them, or
> making a huge effort to add temporary code, defines etc that will be
> removed again right after the changes have landed.

Agreed. My preference would be to treat edk2-non-osi as the chicken,
and edk2-platforms the egg. I could put the requisite edk2-non-osi
hash into the edk2-platforms commit message before pushing, adding a
line like:

"This commit requires the edk2-non-osi in use to contain commit <hash>
in order to build."

If I'm feeling nitpicky, that could replace the comment
"No other changes are being applied at this stage."

Pete: would you be OK with those two changes?

Best Regards,

Leif

  parent reply	other threads:[~2019-10-21 13:46 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-21 11:25 [edk2-platforms][PATCH 1/1] Platforms/RPi3: Restructure platform in preparation for Pi 4 Pete Batard
2019-10-21 12:28 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-10-21 12:52   ` Pete Batard
2019-10-21 13:09     ` Philippe Mathieu-Daudé
2019-10-21 13:24       ` Ard Biesheuvel
2019-10-21 13:37         ` Pete Batard
2019-10-21 13:46         ` Leif Lindholm [this message]
2019-10-21 14:28           ` Pete Batard
2019-10-21 14:39             ` Leif Lindholm
2019-10-21 16:59               ` Pete Batard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191021134628.GC16820@bivouac.eciton.net \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox