[PATCH for 9.1 v3 0/2] meson: Fix MESONINTROSPECT parsing

Akihiko Odaki posted 2 patches 1 year, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240327-meson-v3-0-7e6cdef1be8a@daynix.com
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Beraldo Leal <bleal@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>
configure                                  |   5 +++++
python/scripts/vendor.py                   |   4 ++--
python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes
python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes
pythondeps.toml                            |   2 +-
scripts/symlink-install-tree.py            |   3 ++-
6 files changed, 10 insertions(+), 4 deletions(-)
[PATCH for 9.1 v3 0/2] meson: Fix MESONINTROSPECT parsing
Posted by Akihiko Odaki 1 year, 10 months ago
The arguments in MESONINTROSPECT are quoted with shlex.quote() so it
must be parsed with shlex.split().

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

To: Beraldo Leal <bleal@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Cleber Rosa <crosa@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>

Changes in v3:
- Ensured meson>=1.4.0 on Windows.
- Link to v2: https://lore.kernel.org/r/20240326-meson-v2-0-d9f9003775e9@daynix.com

Changes in v2:
- Added patch "buildsys: Bump known good meson version to v1.4.0".
- Link to v1: https://lore.kernel.org/r/20230812061540.5398-1-akihiko.odaki@daynix.com

---
Akihiko Odaki (2):
      buildsys: Bump known good meson version to v1.4.0
      meson: Fix MESONINTROSPECT parsing

 configure                                  |   5 +++++
 python/scripts/vendor.py                   |   4 ++--
 python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes
 python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes
 pythondeps.toml                            |   2 +-
 scripts/symlink-install-tree.py            |   3 ++-
 6 files changed, 10 insertions(+), 4 deletions(-)
---
base-commit: ba49d760eb04630e7b15f423ebecf6c871b8f77b
change-id: 20240326-meson-b5e2c7a2fb2f

Best regards,
-- 
Akihiko Odaki <akihiko.odaki@daynix.com>


Re: [PATCH for 9.1 v3 0/2] meson: Fix MESONINTROSPECT parsing
Posted by Peter Maydell 1 year, 3 months ago
On Wed, 27 Mar 2024 at 01:50, Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>
> The arguments in MESONINTROSPECT are quoted with shlex.quote() so it
> must be parsed with shlex.split().
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
>
> To: Beraldo Leal <bleal@redhat.com>
> To: Peter Maydell <peter.maydell@linaro.org>
> Cc: qemu-devel@nongnu.org
> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Daniel P. Berrangé <berrange@redhat.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Cleber Rosa <crosa@redhat.com>
> Cc: John Snow <jsnow@redhat.com>
> Cc: Michael Tokarev <mjt@tls.msk.ru>
>
> Changes in v3:
> - Ensured meson>=1.4.0 on Windows.
> - Link to v2: https://lore.kernel.org/r/20240326-meson-v2-0-d9f9003775e9@daynix.com
>
> Changes in v2:
> - Added patch "buildsys: Bump known good meson version to v1.4.0".
> - Link to v1: https://lore.kernel.org/r/20230812061540.5398-1-akihiko.odaki@daynix.com
>
> ---
> Akihiko Odaki (2):
>       buildsys: Bump known good meson version to v1.4.0
>       meson: Fix MESONINTROSPECT parsing
>
>  configure                                  |   5 +++++
>  python/scripts/vendor.py                   |   4 ++--
>  python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes
>  python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes
>  pythondeps.toml                            |   2 +-
>  scripts/symlink-install-tree.py            |   3 ++-
>  6 files changed, 10 insertions(+), 4 deletions(-)

I've just had a report of somebody running into this
"if you have a ~ in your build dir then symlink-install-tree
breaks" bug, and realized we never applied this series.

We've just required rust 1.5.0 (commit 07f0d32641e0) because
we need it for the Rust support, so we don't need patch 1
here any more or the windows-specific bits in patch 2.
So I think we can just update the symlink-install-tree script
now, which ironically is what v1 of this patchset did :-)
(Though if we cared about fixing this in the stable
branches that would be more awkward.)

-- PMM