Re: [PATCH v2 00/10] meson: replace submodules with wrap files

[Paolo Bonzini]

No, Michal is correct. Patch "meson: subprojects: replace
berkeley-{soft,test}float-3 with wraps" did not remove the submodules.

Paolo

On Wed, Jun 7, 2023 at 10:54 AM Michal Prívozník <mprivozn@redhat.com> wrote:
>
> On 6/7/23 09:47, Daniel P. Berrangé wrote:
> > On Wed, Jun 07, 2023 at 09:41:40AM +0200, Michal Prívozník wrote:
> >> On 6/5/23 11:52, Paolo Bonzini wrote:
> >>> This series replaces git submodules for bundled libraries with .wrap
> >>> files that can be used directly by meson for subprojects.
> >>
> >> Pardon my lack of knowledge, but even after I clone new repo and run:
> >>
> >>   ./configure --enable-donwload && make && make test
> >>
> >> I still see berkeley-softfloat-3 submodule missing:
> >>
> >>   git submodule status
> >>   ...
> >>   0c37a43527f0ee2b9584e7fb2fdc805e902635ac roms/vbootrom
> >>   fatal: no submodule mapping found in .gitmodules for path
> >> 'tests/fp/berkeley-softfloat-3'
> >>
> >> Is this expected?
> >
> > Yet another example of submodules sucking. Once we removed the submodules
> > from .gitmodules, git doesn't know what to do with the existing chcked
> > out submodules from before this time.
> >
> > Best thing todo is purge all existing submodules, eg
> >
> >   git submodule deinit --all --force
> >
> > and if there are stale directories left over, manually delete those too,
> > so you get back to a more pristine checkout state.
>
> I'm not sure that helps. I mean:
>
>   git clone https://gitlab.com/qemu-project/qemu.git qemu2.git && \
>   cd qemu2.git/ && \
>   git submodule status
>
> still complains:
>
>   fatal: no submodule mapping found in .gitmodules for path
> 'tests/fp/berkeley-softfloat-3'
>
> Michal
>