diff options
| author | Peter Maydell | 2020-11-26 15:25:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-11-26 15:25:47 +0100 |
| commit | 6cfdaa88cfde716ebc8538f60a9648483049edf4 (patch) | |
| tree | 4cfee5456c0c8344f680d6745e920dfe7068edfc /.cirrus.yml | |
| parent | Update version for v5.2.0-rc3 release (diff) | |
| parent | nsis: Fix build for 64 bit installer (diff) | |
| download | qemu-6cfdaa88cfde716ebc8538f60a9648483049edf4.tar.gz qemu-6cfdaa88cfde716ebc8538f60a9648483049edf4.tar.xz qemu-6cfdaa88cfde716ebc8538f60a9648483049edf4.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Remove obsolete setuptools dependency and fix Stefan's
Win32 builds.
# gpg: Signature made Thu 26 Nov 2020 14:21:28 GMT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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
* remotes/bonzini-gitlab/tags/for-upstream:
nsis: Fix build for 64 bit installer
tests/docker, tests/vm: remove setuptools from images
configure: remove python pkg_resources check
meson: use dependency() to find libjpeg
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 08db7c419f..62a9b57530 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,7 +87,6 @@ windows_msys2_task: C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \ diffutils git grep make pkg-config sed \ mingw-w64-x86_64-python \ - mingw-w64-x86_64-python-setuptools \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-SDL2 \ mingw-w64-x86_64-SDL2_image \ |