]> git.proxmox.com Git - mirror_qemu.git/commitdiff
tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
authorThomas Huth <thuth@redhat.com>
Mon, 13 Jul 2020 20:04:06 +0000 (21:04 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Wed, 15 Jul 2020 10:52:43 +0000 (11:52 +0100)
The libssh problem only exists in Ubuntu 18.04 - we can enable it
in 20.04 again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200713185237.9419-1-thuth@redhat.com>
Message-Id: <20200713200415.26214-3-alex.bennee@linaro.org>

tests/docker/dockerfiles/ubuntu2004.docker

index f7aac840bf8679522fa6706281b5bcd310087f96..8d10934a2a75b3451d2ea968f145285fae117928 100644 (file)
@@ -65,9 +65,6 @@ RUN apt-get update && \
 RUN dpkg -l $PACKAGES | sort > /packages.txt
 ENV FEATURES clang tsan pyyaml sdl2
 
-# https://bugs.launchpad.net/qemu/+bug/1838763
-ENV QEMU_CONFIGURE_OPTS --disable-libssh
-
 # Apply patch https://reviews.llvm.org/D75820
 # This is required for TSan in clang-10 to compile with QEMU.
 RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h