From 92ea0270179839aee4e5addb6518945fe31c21e4 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 25 Nov 2020 12:50:48 -0500
Subject: [PATCH] tests/docker, tests/vm: remove setuptools from images
Setuptools is not needed anymore by the bundled copy of meson,
remove it.
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.cirrus.yml | 1 -
tests/docker/dockerfiles/debian10.docker | 1 -
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
tests/vm/freebsd | 1 -
tests/vm/haiku.x86_64 | 1 -
tests/vm/netbsd | 1 -
tests/vm/openbsd | 1 -
8 files changed, 8 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index f0209b7a3e7..2e45b3254fa 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -85,7 +85,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 \
diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
index 21cc671d71c..73a3caac9cd 100644
--- a/tests/docker/dockerfiles/debian10.docker
+++ b/tests/docker/dockerfiles/debian10.docker
@@ -30,7 +30,6 @@ RUN apt update && \
pkg-config \
psmisc \
python3 \
- python3-setuptools \
python3-sphinx \
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 5903e1b0b44..087df598a09 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -30,7 +30,6 @@ ENV PACKAGES \
perl-Test-Harness \
python3 \
python3-PyYAML \
- python3-setuptools \
tar \
which
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 7f03cd8ffca..d5d2f5f00d6 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -26,7 +26,6 @@ ENV PACKAGES \
perl-Test-Harness \
python3 \
python3-PyYAML \
- python3-setuptools \
tar \
which
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 04ee7933812..09f3ee6cb82 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM):
"pkgconf",
"bzip2",
"python37",
- "py37-setuptools",
"ninja",
# gnu tools
diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
index 37af48bf1bb..2eb736dae12 100755
--- a/tests/vm/haiku.x86_64
+++ b/tests/vm/haiku.x86_64
@@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM):
"devel:libusb_1.0",
"devel:libz",
"ninja",
- "setuptools_python3"
]
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index 596717cc76f..b9efc269d26 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM):
"pkgconf",
"xz",
"python37",
- "py37-setuptools",
"ninja-build",
# gnu tools
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 386b2c72f77..4d1399378e6 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM):
"git",
"pkgconf",
"bzip2", "xz",
- "py3-setuptools",
"ninja",
# gnu tools
--
GitLab