Re: [PATCH 0/5] meson: replace submodules with wrap files

["Daniel P. Berrangé" <berrange@redhat.com>]

On Tue, May 30, 2023 at 02:18:30PM +0200, Thomas Huth wrote:
> On 27/05/2023 11.28, Paolo Bonzini wrote:
> > This series replaces git submodules for bundled libraries with .wrap
> > files that can be used directly by meson for subprojects.
> ...
> > The remaining submodules consist of tests/lcitool/libvirt-ci and the
> > firmware in roms/.
> 
> We talked about moving the contents of roms/ to a separate repository a
> couple of times ... maybe it's time now that we really do it?
> 
> (However, when I tried to tackle the "do we need to ship the firmware
> sources with the main tarball" problem the last time, there was no consensus
> how to do it best, see
> https://lore.kernel.org/qemu-devel/20221128092555.37102-1-thuth@redhat.com/
> ... maybe something to discuss at KVM forum...)
> 
> > The former is only used in very specific cases,
> > while the latter is mostly used only as a pointer used to create the QEMU
> > tarball.  Unfortunately, git-submodule.sh is still needed for roms/SLOF,
> > parts of which are used in the QEMU build process for pc-bios/s390-ccw;
> > more on this later in this cover letter.
> > 
> > I'm not sure what's the best way to proceed for roms/SLOF.  Some
> > possibilities, in no particular order, include:
> > 
> > * doing nothing
> > 
> > * merging --with-git-submodules with --enable-download, and
> >    moving the git-submodule.sh rules from the main Makefile to
> >    pc-bios/s390-ccw/ (my favorite option)
> > 
> > * copying the relevant SLOF files into pc-bios/
> 
> Considering that SLOF is also rather on life support already (there is now
> VOF for the sPAPR machine instead, Alexey left IBM, ...), I also wouldn't
> mind the third option, I think.
> 
> But of course we can also start with option 2 and go for option 3 later.

My inclination would be for option 3 too, just copy the relevant files
into s390-ccw dir, so the two distinct ROMs are fully separated from
each other.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|