On Mon, Oct 21, 2019 at 03:28:37PM +0100, Pete Batard wrote: > Hi Leif, > > On 2019.10.21 14:46, Leif Lindholm wrote: > > On Mon, Oct 21, 2019 at 03:24:47PM +0200, Ard Biesheuvel wrote: > > > On Mon, 21 Oct 2019 at 15:09, Philippe Mathieu-Daudé <phi...@redhat.com> > > > wrote: > > > > > 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? > > Sounds good. Feel free to go ahead with these changes, thanks.
In that case: Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org> Pushed as 03f36b8fcfb7. Thanks! Do you know when the Pi4 upstreaming is likely to start? As you may have seen from my autoresponder, I'm traveling this week and next. Best Regards, Leif (from the backseat of a car going down the M25) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49307): https://edk2.groups.io/g/devel/message/49307 Mute This Topic: https://groups.io/mt/36312720/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
