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>
No related branches found
No related tags found
Showing
- .gitlab-ci.d/buildtest-template.yml 0 additions, 4 deletions.gitlab-ci.d/buildtest-template.yml
- .gitlab-ci.d/custom-runners.yml 3 additions, 1 deletion.gitlab-ci.d/custom-runners.yml
- Makefile 3 additions, 3 deletionsMakefile
- configure 9 additions, 1 deletionconfigure
- python/scripts/mkvenv.py 90 additions, 60 deletionspython/scripts/mkvenv.py
- python/setup.cfg 0 additions, 6 deletionspython/setup.cfg
- scripts/archive-source.sh 1 addition, 1 deletionscripts/archive-source.sh
- scripts/meson-buildoptions.py 0 additions, 0 deletionsscripts/meson-buildoptions.py
- scripts/modinfo-collect.py 0 additions, 0 deletionsscripts/modinfo-collect.py
- scripts/modinfo-generate.py 0 additions, 0 deletionsscripts/modinfo-generate.py
- scripts/probe-gdb-support.py 0 additions, 0 deletionsscripts/probe-gdb-support.py
Loading
Please register or sign in to comment