qemu/tests/docker/dockerfiles
Peter Maydell 6cfdaa88cf Remove obsolete setuptools dependency and fix Stefan's
Win32 builds.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl+/uegUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroPMiwgAj6VB/lZP10CmKfNCIC6s9TjONP2I
 ruI3ZMYBrmeiLMf/WZTDI0kRY/mmYMtn4nN+RlEHlBE9a9hSCmHWvQyZDgEIJUOA
 1bTAdl4jFAbBv4knKVVuPSu/kMDHVIkwdktEEmPhkMHunIxrI7Yobe4r0GMXXZJm
 Vu4dNtskzERu/fc+lgbdMjRU+xlXT/zYHy98L5mu+VRgKgmtY/6aF1et4t+EfM9f
 tu3vd/WEOn/HiYvOsVj55SNSR6IiXTGq0LS5d4fI2Q9B477qoO+x3QJDzjbHBo+u
 u58QkbqJa5OfO0ZoUAi+SvOjE0EhJFPL5ihVODjkTSbORpfWz3ULyAK1nQ==
 =Mdqh
 -----END PGP SIGNATURE-----

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>
2020-11-26 14:25:47 +00:00
..
centos7.docker tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 2020-10-27 09:53:47 +00:00
centos8.docker tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 2020-10-27 09:53:47 +00:00
debian10.docker tests/docker, tests/vm: remove setuptools from images 2020-11-25 12:50:48 -05:00
debian11.docker tests/docker: add debian11 base image 2020-05-27 14:26:49 +01:00
debian-all-test-cross.docker tests/docker: add a linux-user testing focused image 2020-07-11 15:53:00 +01:00
debian-alpha-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-amd64-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-amd64.docker test/docker/dockerfiles: Add missing packages for acceptance tests 2020-10-26 09:54:16 +01:00
debian-arm64-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-arm64-test-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-armel-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-armhf-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-bootstrap.docker docker: add commentary to debian-bootstrap.docker 2018-07-24 11:45:25 +01:00
debian-bootstrap.pre tests/docker: add support for DEB_KEYRING 2020-07-27 09:41:35 +01:00
debian-hppa-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-m68k-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-mips64-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-mips64el-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-mips-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-mipsel-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-powerpc-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-ppc64-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-ppc64el-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-riscv64-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-s390x-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-sh4-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-sparc64-cross.docker tests/docker: change tag naming scheme of our images 2020-07-11 15:53:00 +01:00
debian-tricore-cross.docker tests/docker: Update the tricore container to debian 10 2020-10-02 12:29:08 +01:00
debian-xtensa-cross.docker tests/docker: update toolchain set in debian-xtensa-cross 2020-07-11 15:53:09 +01:00
fedora-cris-cross.docker tests/docker: Update the Fedora cross compile images to 30 2019-06-12 17:53:22 +01:00
fedora-i386-cross.docker configure: Enable test and libs for zstd 2020-02-28 09:24:43 +01:00
fedora-win32-cross.docker tests/docker, tests/vm: remove setuptools from images 2020-11-25 12:50:48 -05:00
fedora-win64-cross.docker tests/docker, tests/vm: remove setuptools from images 2020-11-25 12:50:48 -05:00
fedora.docker test/docker/dockerfiles: Add missing packages for acceptance tests 2020-10-26 09:54:16 +01:00
travis.docker add ninja to dockerfiles, CI configurations and test VMs 2020-10-17 10:45:50 -04:00
ubuntu1804.docker add ninja to dockerfiles, CI configurations and test VMs 2020-10-17 10:45:50 -04:00
ubuntu2004.docker tests/docker: Install liblttng-ust-dev package in Ubuntu 20.04 image 2020-11-23 09:55:20 +00:00
ubuntu.docker add ninja to dockerfiles, CI configurations and test VMs 2020-10-17 10:45:50 -04:00