[Qemu-commits] [qemu/qemu] dde001: remove remaining traces of meson submodule

[Richard Henderson]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: dde001ef7161a313e4fe43bb522e8ccc02dffa9e
      
https://github.com/qemu/qemu/commit/dde001ef7161a313e4fe43bb522e8ccc02dffa9e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml
    M scripts/archive-source.sh

  Log Message:
  -----------
  remove remaining traces of meson submodule

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c673f3d0fe87f6e23a259c620fba7fc9e9d3621f
      
https://github.com/qemu/qemu/commit/c673f3d0fe87f6e23a259c620fba7fc9e9d3621f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M python/scripts/mkvenv.py
    M python/setup.cfg

  Log Message:
  -----------
  mkvenv: replace distlib.database with importlib.metadata/pkg_resources

importlib.metadata is just as good as distlib.database and a bit more
battle-proven for "egg" based distributions, and in fact that is exactly
why mkvenv.py is not using distlib.database to find entry points: it
simply does not work for eggs.

The only disadvantage of importlib.metadata is that it is not available
by default before Python 3.8, so we need a fallback to pkg_resources
(again, just like for the case of finding entry points).  Do so to
fix issues where incorrect egg metadata results in a JSONDecodeError.

While at it, reuse the new _get_version function to diagnose an incorrect
version of the package even if importlib.metadata is not available.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b0fcc6fc7fc11278c8ca344d8d9c6e5d05742f79
      
https://github.com/qemu/qemu/commit/b0fcc6fc7fc11278c8ca344d8d9c6e5d05742f79
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  build: rebuild build.ninja using "meson setup --reconfigure"

Do not use the rule in build.ninja, because the path to meson is hardcoded
in build.ninja and this breaks if meson moves (for example if the distro
meson suddenly becomes too old after an update).

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 973038db87154f954e8cd889d706089489a43d46
      
https://github.com/qemu/qemu/commit/973038db87154f954e8cd889d706089489a43d46
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: fix backwards-compatibility for meson sphinx_build option

Reintroduce the cmd_line.txt mangling to remove the sphinx_build option
when rerunning meson.  The mechanism was removed in commit 75cc28648574
("configure: remove backwards-compatibility code", 2023-01-11) because
the fixups were obsolete at the time; however, the Meson deprecation
mechanism doesn't quite work when options are finally removed, so we
need to bring it back.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d37c21b5fb34aaa01eeabf75a57cf141d76af42f
      
https://github.com/qemu/qemu/commit/d37c21b5fb34aaa01eeabf75a57cf141d76af42f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M python/scripts/mkvenv.py

  Log Message:
  -----------
  mkvenv: pass first missing package to diagnose()

If sphinx is present but the theme is not, mkvenv will print an
inaccurate diagnostic:

ERROR: Could not find a version that satisfies the requirement 
sphinx-rtd-theme>=0.5.0 (from versions: none)
ERROR: No matching distribution found for sphinx-rtd-theme>=0.5.0

'sphinx>=1.6.0' not found:
 • Python package 'sphinx' version '5.3.0' was found, but isn't suitable.
 • mkvenv was configured to operate offline and did not check PyPI.

Instead, ignore the packages that were found to be present, and report
an error based on the first absent package.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9fd9f3952f20046dd454f85dc46c9d13af50c700
      
https://github.com/qemu/qemu/commit/9fd9f3952f20046dd454f85dc46c9d13af50c700
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M .gitlab-ci.d/custom-runners.yml

  Log Message:
  -----------
  gitlab: custom-runners: preserve more artifacts for debugging

Since custom runners are not generally available, make it possible to
debug the differences between a successful and a failing build by
comparing the logs and the build.ninja rules.

Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 4b424c757188f7a47630a4d8edcf4ad9f19255bc
      
https://github.com/qemu/qemu/commit/4b424c757188f7a47630a4d8edcf4ad9f19255bc
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-05-19 (Fri, 19 May 2023)

  Changed paths:
    M configure
    M scripts/meson-buildoptions.py
    M scripts/modinfo-collect.py
    M scripts/modinfo-generate.py
    M scripts/probe-gdb-support.py

  Log Message:
  -----------
  scripts: make sure scripts are invoked via $(PYTHON)

Some scripts are invoked via the first "python3" binary in the PATH,
because they are executable and their shebang line is "#! /usr/bin/env
python3".  To enforce usage of $(PYTHON), make them nonexecutable.
Scripts invoked via meson need nothing else, and meson-buildoptions.py
is already using $(PYTHON).  For probe-gdb-support.py however the
invocation in the configure script has to be adjusted.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ffd9492f2a713c614025a87add4517db61d77609
      
https://github.com/qemu/qemu/commit/ffd9492f2a713c614025a87add4517db61d77609
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-05-21 (Sun, 21 May 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml
    M .gitlab-ci.d/custom-runners.yml
    M Makefile
    M configure
    M python/scripts/mkvenv.py
    M python/setup.cfg
    M scripts/archive-source.sh
    M scripts/meson-buildoptions.py
    M scripts/modinfo-collect.py
    M scripts/modinfo-generate.py
    M scripts/probe-gdb-support.py

  Log Message:
  -----------
  Merge tag 'for-upstream-urgent' of https://gitlab.com/bonzini/qemu into 
staging

Fixes for Python venv changes

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmRn7D4UHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroOHbQgAiQW824iL2Iw+wjYckp0rwLxe53+z
# P4kCdQePrfKW3sPglbeDArPr4gzuo7bdj75dscZmco+nBU40qGqEpRHBqjQol5pE
# kcQsmqx+0Udbsc6kJe47fgSsBLD2KbT1QQCVBgScNuDviogQ0/PCLNWjk9V4OhgL
# 0ZlK8QFnuv0qNthS+oNjkNi6SYGYNOw+4LQ/WcLWnowwhNRGUvYoq9QdOCocfyxD
# t+1xQvF4Pxqnhbkni51JRoXv/Np8U/yDHMgonvw8BLxTMNAes4nV7ifzyW2pltnf
# YEHGUKYPtrPR9dKLr/Au9ktr7n3O5ikOEpPIPSi4BwFqzv6hdE4DDAMXDA==
# =Auyq
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 19 May 2023 02:38:06 PM PDT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream-urgent' of https://gitlab.com/bonzini/qemu:
  scripts: make sure scripts are invoked via $(PYTHON)
  gitlab: custom-runners: preserve more artifacts for debugging
  mkvenv: pass first missing package to diagnose()
  configure: fix backwards-compatibility for meson sphinx_build option
  build: rebuild build.ninja using "meson setup --reconfigure"
  mkvenv: replace distlib.database with importlib.metadata/pkg_resources
  remove remaining traces of meson submodule

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/aa222a8e4f97...ffd9492f2a71