diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-05-21 07:46:13 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-05-21 07:46:13 -0700 |
| commit | ffd9492f2a713c614025a87add4517db61d77609 (patch) | |
| tree | 4f681c3e0b83f46a313ca6da3b18b4ed265f0659 /scripts | |
| parent | aa222a8e4f975284b3f8f131653a4114b3d333b3 (diff) | |
| parent | 4b424c757188f7a47630a4d8edcf4ad9f19255bc (diff) | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/archive-source.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/meson-buildoptions.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/modinfo-collect.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/modinfo-generate.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/probe-gdb-support.py | 0 |
5 files changed, 1 insertions, 1 deletions
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 23e042dacd..c035329154 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules="dtc meson ui/keycodemapdb" +submodules="dtc ui/keycodemapdb" submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" sub_deinit="" diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 8d2e526132..8d2e526132 100755..100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py diff --git a/scripts/modinfo-collect.py b/scripts/modinfo-collect.py index 4e7584df66..4e7584df66 100755..100644 --- a/scripts/modinfo-collect.py +++ b/scripts/modinfo-collect.py diff --git a/scripts/modinfo-generate.py b/scripts/modinfo-generate.py index b1538fcced..b1538fcced 100755..100644 --- a/scripts/modinfo-generate.py +++ b/scripts/modinfo-generate.py diff --git a/scripts/probe-gdb-support.py b/scripts/probe-gdb-support.py index 5755255966..5755255966 100755..100644 --- a/scripts/probe-gdb-support.py +++ b/scripts/probe-gdb-support.py |