Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging master staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2020 14:25:47 +0000 (14:25 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2020 14:25:47 +0000 (14:25 +0000)
commit6cfdaa88cfde716ebc8538f60a9648483049edf4
tree4cfee5456c0c8344f680d6745e920dfe7068edfc
parentdd3d2340c4076d1735cd0f7cb61f4d8622b9562d
parent24bdcc9608fad3dce2bcf3362722493f1ba0f3eb
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>
.cirrus.yml