Thomas Huth <th...@redhat.com> writes:

> The libssh problem only exists in Ubuntu 18.04 - we can enable it
> in 20.04 again.

Queued to misc/for-5.1-rc0, thanks.

>
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
>  tests/docker/dockerfiles/ubuntu2004.docker | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker 
> b/tests/docker/dockerfiles/ubuntu2004.docker
> index f7aac840bf..8d10934a2a 100644
> --- a/tests/docker/dockerfiles/ubuntu2004.docker
> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> @@ -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


-- 
Alex Bennée

Reply via email to