From: Peter Maydell Date: Thu, 26 Nov 2020 14:25:47 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6cfdaa88cfde716ebc8538f60a9648483049edf4;p=qemu.git 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 " [full] # gpg: aka "Paolo Bonzini " [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 --- 6cfdaa88cfde716ebc8538f60a9648483049edf4