[v2] Update libslirp & make it a subproject

[PATCH v2 0/2] Update libslirp & make it a subproject

Posted by marcandre.lureau@redhat.com 3 years, 3 months ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Hi,

Here is a few patches to update libslirp to git upstream.
Since it now supports meson subproject(), adapt the build
system to use it, and related fixes.

v2:
 - fix unused variables on macos
 - fork_exec_child_setup: improve signal handling

Marc-André Lureau (2):
  slirp: update to git master
  build-sys: make libslirp a meson subproject

 configure            |  2 +-
 meson.build          | 62 +++-----------------------------------------
 .gitmodules          |  4 +--
 slirp                |  1 -
 subprojects/libslirp |  1 +
 5 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 160000 slirp
 create mode 160000 subprojects/libslirp

-- 
2.29.0

Re: [PATCH v2 0/2] Update libslirp & make it a subproject

Posted by Philippe Mathieu-Daudé 3 years, 1 month ago

Hi Marc-André,

On 1/25/21 8:34 AM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Hi,
> 
> Here is a few patches to update libslirp to git upstream.
> Since it now supports meson subproject(), adapt the build
> system to use it, and related fixes.
> 
> v2:
>  - fix unused variables on macos
>  - fork_exec_child_setup: improve signal handling
> 
> Marc-André Lureau (2):
>   slirp: update to git master
>   build-sys: make libslirp a meson subproject
> 
>  configure            |  2 +-
>  meson.build          | 62 +++-----------------------------------------
>  .gitmodules          |  4 +--
>  slirp                |  1 -
>  subprojects/libslirp |  1 +
>  5 files changed, 8 insertions(+), 62 deletions(-)
>  delete mode 160000 slirp
>  create mode 160000 subprojects/libslirp

Just out of curiosity, why "subprojects"? Should we move
other submodules there (meson, dtc, keycodemapdb)?

Re: [PATCH v2 0/2] Update libslirp & make it a subproject

Posted by Marc-André Lureau 3 years, 1 month ago

Hi

On Mon, Mar 8, 2021 at 2:03 PM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:

> Hi Marc-André,
>
> On 1/25/21 8:34 AM, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Hi,
> >
> > Here is a few patches to update libslirp to git upstream.
> > Since it now supports meson subproject(), adapt the build
> > system to use it, and related fixes.
> >
> > v2:
> >  - fix unused variables on macos
> >  - fork_exec_child_setup: improve signal handling
> >
> > Marc-André Lureau (2):
> >   slirp: update to git master
> >   build-sys: make libslirp a meson subproject
> >
> >  configure            |  2 +-
> >  meson.build          | 62 +++-----------------------------------------
> >  .gitmodules          |  4 +--
> >  slirp                |  1 -
> >  subprojects/libslirp |  1 +
> >  5 files changed, 8 insertions(+), 62 deletions(-)
> >  delete mode 160000 slirp
> >  create mode 160000 subprojects/libslirp
>
> Just out of curiosity, why "subprojects"? Should we move
> other submodules there (meson, dtc, keycodemapdb)?
>

It's required when you use meson subproject() :
https://mesonbuild.com/Subprojects.html#why-must-all-subprojects-be-inside-a-single-directory

(btw, the patch series has conflicts with the current git, I'll send a v3)

-- 
Marc-André Lureau

Re: [PATCH v2 0/2] Update libslirp & make it a subproject

Posted by Philippe Mathieu-Daudé 3 years, 1 month ago

On 3/8/21 11:23 AM, Marc-André Lureau wrote:
> Hi
> 
> On Mon, Mar 8, 2021 at 2:03 PM Philippe Mathieu-Daudé <philmd@redhat.com
> <mailto:philmd@redhat.com>> wrote:
> 
>     Hi Marc-André,
> 
>     On 1/25/21 8:34 AM, marcandre.lureau@redhat.com
>     <mailto:marcandre.lureau@redhat.com> wrote:
>     > From: Marc-André Lureau <marcandre.lureau@redhat.com
>     <mailto:marcandre.lureau@redhat.com>>
>     >
>     > Hi,
>     >
>     > Here is a few patches to update libslirp to git upstream.
>     > Since it now supports meson subproject(), adapt the build
>     > system to use it, and related fixes.
>     >
>     > v2:
>     >  - fix unused variables on macos
>     >  - fork_exec_child_setup: improve signal handling
>     >
>     > Marc-André Lureau (2):
>     >   slirp: update to git master
>     >   build-sys: make libslirp a meson subproject
>     >
>     >  configure            |  2 +-
>     >  meson.build          | 62
>     +++-----------------------------------------
>     >  .gitmodules          |  4 +--
>     >  slirp                |  1 -
>     >  subprojects/libslirp |  1 +
>     >  5 files changed, 8 insertions(+), 62 deletions(-)
>     >  delete mode 160000 slirp
>     >  create mode 160000 subprojects/libslirp
> 
>     Just out of curiosity, why "subprojects"? Should we move
>     other submodules there (meson, dtc, keycodemapdb)?
> 
> 
> It's required when you use meson subproject() :
> https://mesonbuild.com/Subprojects.html#why-must-all-subprojects-be-inside-a-single-directory
> <https://mesonbuild.com/Subprojects.html#why-must-all-subprojects-be-inside-a-single-directory>

Oh interesting. As this link is relevant information, can you amend
it to patch #2 description please?

> 
> 
> (btw, the patch series has conflicts with the current git, I'll send a v3)
> 
> -- 
> Marc-André Lureau