mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 15:02:54 +00:00
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>
This commit is contained in:
parent
8e84bf984a
commit
92ea027017
|
@ -85,7 +85,6 @@ windows_msys2_task:
|
||||||
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
|
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
|
||||||
diffutils git grep make pkg-config sed \
|
diffutils git grep make pkg-config sed \
|
||||||
mingw-w64-x86_64-python \
|
mingw-w64-x86_64-python \
|
||||||
mingw-w64-x86_64-python-setuptools \
|
|
||||||
mingw-w64-x86_64-toolchain \
|
mingw-w64-x86_64-toolchain \
|
||||||
mingw-w64-x86_64-SDL2 \
|
mingw-w64-x86_64-SDL2 \
|
||||||
mingw-w64-x86_64-SDL2_image \
|
mingw-w64-x86_64-SDL2_image \
|
||||||
|
|
|
@ -30,7 +30,6 @@ RUN apt update && \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
psmisc \
|
psmisc \
|
||||||
python3 \
|
python3 \
|
||||||
python3-setuptools \
|
|
||||||
python3-sphinx \
|
python3-sphinx \
|
||||||
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
|
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ ENV PACKAGES \
|
||||||
perl-Test-Harness \
|
perl-Test-Harness \
|
||||||
python3 \
|
python3 \
|
||||||
python3-PyYAML \
|
python3-PyYAML \
|
||||||
python3-setuptools \
|
|
||||||
tar \
|
tar \
|
||||||
which
|
which
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ ENV PACKAGES \
|
||||||
perl-Test-Harness \
|
perl-Test-Harness \
|
||||||
python3 \
|
python3 \
|
||||||
python3-PyYAML \
|
python3-PyYAML \
|
||||||
python3-setuptools \
|
|
||||||
tar \
|
tar \
|
||||||
which
|
which
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM):
|
||||||
"pkgconf",
|
"pkgconf",
|
||||||
"bzip2",
|
"bzip2",
|
||||||
"python37",
|
"python37",
|
||||||
"py37-setuptools",
|
|
||||||
"ninja",
|
"ninja",
|
||||||
|
|
||||||
# gnu tools
|
# gnu tools
|
||||||
|
|
|
@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM):
|
||||||
"devel:libusb_1.0",
|
"devel:libusb_1.0",
|
||||||
"devel:libz",
|
"devel:libz",
|
||||||
"ninja",
|
"ninja",
|
||||||
"setuptools_python3"
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)
|
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)
|
||||||
|
|
|
@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM):
|
||||||
"pkgconf",
|
"pkgconf",
|
||||||
"xz",
|
"xz",
|
||||||
"python37",
|
"python37",
|
||||||
"py37-setuptools",
|
|
||||||
"ninja-build",
|
"ninja-build",
|
||||||
|
|
||||||
# gnu tools
|
# gnu tools
|
||||||
|
|
|
@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM):
|
||||||
"git",
|
"git",
|
||||||
"pkgconf",
|
"pkgconf",
|
||||||
"bzip2", "xz",
|
"bzip2", "xz",
|
||||||
"py3-setuptools",
|
|
||||||
"ninja",
|
"ninja",
|
||||||
|
|
||||||
# gnu tools
|
# gnu tools
|
||||||
|
|
Loading…
Reference in a new issue