Re: [PATCH 1/3] scripts/make-release: Do not include the edk2 sources in the tarball anymore

[Thomas Huth]

On 04/07/2022 12.45, Daniel P. Berrangé wrote:
> On Mon, Jul 04, 2022 at 11:37:11AM +0200, Thomas Huth wrote:
> > On 04/07/2022 11.14, Daniel P. Berrangé wrote:
> > > On Mon, Jul 04, 2022 at 08:26:34AM +0100, Stefan Hajnoczi wrote:
> > > > On Mon, 4 Jul 2022 at 07:45, Thomas Huth <thuth@redhat.com> wrote:
> > ...
> > > > > +cat > sources.txt <<EOF
> > > > > +The edk2 sources can be downloaded from:
> > > > > +
> > > > > +https://github.com/tianocore/edk2/archive/${edk2rev}.tar.gz
> > > >
> > > > Please use QEMU's edk2 mirror:
> > > > https://gitlab.com/qemu-project/edk2
> > > >
> > > > QEMU mirrors all dependencies so that even if upstream projects go
> > > > offline we can still rebuild all of QEMU from source.
> > >
> > > Note that the github/lab generated tarballs are not signed, while
> > > QEMU's release tarballs are gpg signed, so from that POV this would
> > > be a regression no matter which site we point to.
> >
> > Maybe we should point to the edk2 release page instead? I.e.:
> >
> >   https://github.com/tianocore/edk2/releases
> >
> > Anyway, it's IMHO certainly not *our* job to provide signed edk2 sources here.
> >
> > > Also it would need more guidance on what to actually do with the
> > > tarball, as if you merely unpack it into this dir, it won't work
> > > as it will be one level of dirs nesting too deep for QEMU's
> > > build scripts to work.
> >
> > I could add some wording how to use the edk2-build.sh script with a
> > downloaded edk2 tarball if that helps ... not sure whether it is really
> > required, though, we also don't provide instruction for building any other
> > firmware yet, as far as I know.
>
> Well my thought is that currently you can do  'make -C roms efi' from
> the unpacked release tarball, and with this change, that no longer
> works. So we ought to explain what to do to get that working again.
>
> This doesn't neccessarily means docs. It could just be 'make' prints
> out an error telling people what to do, or figure it out itself.
>
> If we split off the entire of the 'roms' directory into a self-contained
> firmware-src tarball, the 'roms/Makefile' would still "just work".

Sorry for the late reply, I've been pondering about this for a while and was 
busy with other stuff...

So I think I tend to agree - if we still want to ship the edk2 (and skiboot) 
sources, it's likely best if we put all roms/* sources into a separate 
tarball. Maybe even split the roms folder into a separate git repository.

However, there's at least one minor obstacle: The sources of the s390-ccw 
bios (in pc-bios/s390-ccw) currently partly depend on the roms/SLOF sources 
to be available for the full build. So if we slice out the roms/SLOF stuff, 
we should likely move the s390-ccw bios also to same location...

I guess it's now too late for 7.1, so I'll postpone my further work on this 
to the 7.2 release cycle.

 Thomas