[PULL 00/24] Meson changes for 2020-09-01

Paolo Bonzini posted 24 patches 3 years, 8 months ago
Test docker-quick@centos7 passed
Test docker-mingw@fedora passed
Test checkpatch passed
Test FreeBSD failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200901091132.29601-1-pbonzini@redhat.com
Maintainers: Kevin Wolf <kwolf@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Max Reitz <mreitz@redhat.com>, Thomas Huth <thuth@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Cornelia Huck <cohuck@redhat.com>
There is a newer version of this series
Makefile                           | 122 +------------------------------------
block/meson.build                  |   4 +-
chardev/meson.build                |   2 +-
configure                          |  65 ++++++--------------
contrib/vhost-user-gpu/meson.build |   2 +-
docs/devel/build-system.rst        |  27 ++++----
docs/meson.build                   |   4 +-
meson                              |   2 +-
meson.build                        |  53 +++++++++++-----
meson_options.txt                  |  33 +++++++---
pc-bios/descriptors/meson.build    |   2 +-
pc-bios/keymaps/meson.build        |   6 +-
pc-bios/meson.build                |  65 +++++++++++++++++++-
pc-bios/optionrom/Makefile         |  10 +--
pc-bios/s390-ccw/Makefile          |   3 +-
qga/meson.build                    |   2 +
scripts/meson.build                |   3 +
scripts/nsis.py                    |  78 ++++++++++++++++++++++++
tools/virtiofsd/meson.build        |   2 +-
trace/meson.build                  |   2 +-
ui/icons/meson.build               |  13 ++++
ui/meson.build                     |   9 ++-
22 files changed, 281 insertions(+), 228 deletions(-)
create mode 100644 scripts/meson.build
create mode 100644 scripts/nsis.py
create mode 100644 ui/icons/meson.build
[PULL 00/24] Meson changes for 2020-09-01
Posted by Paolo Bonzini 3 years, 8 months ago
The following changes since commit 2f4c51c0f384d7888a04b4815861e6d5fd244d75:

  Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31 19:39:13 +0100)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 703230593ffda7699ae81811967b4d2c76a425c1:

  meson: add description to options (2020-09-01 03:10:36 -0400)

----------------------------------------------------------------
meson fixes:
* bump submodule to 0.55.1
* SDL, pixman and zlib fixes
* firmwarepath fix
* fix firmware builds

meson related:
* move install to Meson
* move NSIS to Meson
* do not make meson use cmake
* add description to options

----------------------------------------------------------------
Marc-André Lureau (14):
      meson: install pc-bios blobs
      meson: install scripts/qemu-trace-stap
      meson: install icons
      meson: install desktop file
      meson: install $localstatedir/run for qga
      build-sys: remove install target from Makefile
      configure: rename confsuffix option
      configure: always /-seperate directory from qemu_suffix
      configure: build docdir like other suffixed directories
      meson: pass qemu_suffix option
      meson: use meson datadir instead of qemu_datadir
      meson: pass docdir option
      meson: use meson mandir instead of qemu_mandir
      meson: add NSIS building

Paolo Bonzini (8):
      meson: bump submodule to 0.55.1
      block: always link with zlib
      meson: move zlib detection to meson
      meson: add pixman dependency to UI modules
      configure: do not include ${prefix} in firmwarepath
      meson: use pkg-config method to find dependencies
      build: fix recurse-all target
      meson: add description to options

Stefan Weil (1):
      meson: add pixman dependency to chardev/baum module

Volker Rümelin (1):
      meson: fix SDL2_image detection

 Makefile                           | 122 +------------------------------------
 block/meson.build                  |   4 +-
 chardev/meson.build                |   2 +-
 configure                          |  65 ++++++--------------
 contrib/vhost-user-gpu/meson.build |   2 +-
 docs/devel/build-system.rst        |  27 ++++----
 docs/meson.build                   |   4 +-
 meson                              |   2 +-
 meson.build                        |  53 +++++++++++-----
 meson_options.txt                  |  33 +++++++---
 pc-bios/descriptors/meson.build    |   2 +-
 pc-bios/keymaps/meson.build        |   6 +-
 pc-bios/meson.build                |  65 +++++++++++++++++++-
 pc-bios/optionrom/Makefile         |  10 +--
 pc-bios/s390-ccw/Makefile          |   3 +-
 qga/meson.build                    |   2 +
 scripts/meson.build                |   3 +
 scripts/nsis.py                    |  78 ++++++++++++++++++++++++
 tools/virtiofsd/meson.build        |   2 +-
 trace/meson.build                  |   2 +-
 ui/icons/meson.build               |  13 ++++
 ui/meson.build                     |   9 ++-
 22 files changed, 281 insertions(+), 228 deletions(-)
 create mode 100644 scripts/meson.build
 create mode 100644 scripts/nsis.py
 create mode 100644 ui/icons/meson.build
-- 
2.26.2


Re: [PULL 00/24] Meson changes for 2020-09-01
Posted by Peter Maydell 3 years, 8 months ago
On Tue, 1 Sep 2020 at 10:13, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 2f4c51c0f384d7888a04b4815861e6d5fd244d75:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31 19:39:13 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 703230593ffda7699ae81811967b4d2c76a425c1:
>
>   meson: add description to options (2020-09-01 03:10:36 -0400)
>
> ----------------------------------------------------------------
> meson fixes:
> * bump submodule to 0.55.1
> * SDL, pixman and zlib fixes
> * firmwarepath fix
> * fix firmware builds
>
> meson related:
> * move install to Meson
> * move NSIS to Meson
> * do not make meson use cmake
> * add description to options

This fails to link on the all-linux-static config:

Linking target qemu-arm
/usr/bin/ld: attempted static link of dynamic object
`/usr/lib/x86_64-linux-gnu/libz.so'
collect2: error: ld returned 1 exit status

thanks
-- PMM

Re: [PULL 00/24] Meson changes for 2020-09-01
Posted by 罗勇刚 (Yonggang Luo) 3 years, 8 months ago
Seems forgot queue my undefsym.py patch

On Tue, Sep 1, 2020 at 5:12 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> The following changes since commit
> 2f4c51c0f384d7888a04b4815861e6d5fd244d75:
>
>   Merge remote-tracking branch
> 'remotes/kraxel/tags/usb-20200831-pull-request' into staging (2020-08-31
> 19:39:13 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 703230593ffda7699ae81811967b4d2c76a425c1:
>
>   meson: add description to options (2020-09-01 03:10:36 -0400)
>
> ----------------------------------------------------------------
> meson fixes:
> * bump submodule to 0.55.1
> * SDL, pixman and zlib fixes
> * firmwarepath fix
> * fix firmware builds
>
> meson related:
> * move install to Meson
> * move NSIS to Meson
> * do not make meson use cmake
> * add description to options
>
> ----------------------------------------------------------------
> Marc-André Lureau (14):
>       meson: install pc-bios blobs
>       meson: install scripts/qemu-trace-stap
>       meson: install icons
>       meson: install desktop file
>       meson: install $localstatedir/run for qga
>       build-sys: remove install target from Makefile
>       configure: rename confsuffix option
>       configure: always /-seperate directory from qemu_suffix
>       configure: build docdir like other suffixed directories
>       meson: pass qemu_suffix option
>       meson: use meson datadir instead of qemu_datadir
>       meson: pass docdir option
>       meson: use meson mandir instead of qemu_mandir
>       meson: add NSIS building
>
> Paolo Bonzini (8):
>       meson: bump submodule to 0.55.1
>       block: always link with zlib
>       meson: move zlib detection to meson
>       meson: add pixman dependency to UI modules
>       configure: do not include ${prefix} in firmwarepath
>       meson: use pkg-config method to find dependencies
>       build: fix recurse-all target
>       meson: add description to options
>
> Stefan Weil (1):
>       meson: add pixman dependency to chardev/baum module
>
> Volker Rümelin (1):
>       meson: fix SDL2_image detection
>
>  Makefile                           | 122
> +------------------------------------
>  block/meson.build                  |   4 +-
>  chardev/meson.build                |   2 +-
>  configure                          |  65 ++++++--------------
>  contrib/vhost-user-gpu/meson.build |   2 +-
>  docs/devel/build-system.rst        |  27 ++++----
>  docs/meson.build                   |   4 +-
>  meson                              |   2 +-
>  meson.build                        |  53 +++++++++++-----
>  meson_options.txt                  |  33 +++++++---
>  pc-bios/descriptors/meson.build    |   2 +-
>  pc-bios/keymaps/meson.build        |   6 +-
>  pc-bios/meson.build                |  65 +++++++++++++++++++-
>  pc-bios/optionrom/Makefile         |  10 +--
>  pc-bios/s390-ccw/Makefile          |   3 +-
>  qga/meson.build                    |   2 +
>  scripts/meson.build                |   3 +
>  scripts/nsis.py                    |  78 ++++++++++++++++++++++++
>  tools/virtiofsd/meson.build        |   2 +-
>  trace/meson.build                  |   2 +-
>  ui/icons/meson.build               |  13 ++++
>  ui/meson.build                     |   9 ++-
>  22 files changed, 281 insertions(+), 228 deletions(-)
>  create mode 100644 scripts/meson.build
>  create mode 100644 scripts/nsis.py
>  create mode 100644 ui/icons/meson.build
> --
> 2.26.2
>
>
>

-- 
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo
Re: [PULL 00/24] Meson changes for 2020-09-01
Posted by Paolo Bonzini 3 years, 8 months ago
On 01/09/20 15:19, 罗勇刚(Yonggang Luo) wrote:
> Seems forgot queue my undefsym.py patch

No it's just that I didn't have time to test it properly.

Paolo