tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
RFC PATCH 1/1 tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
The libssh problem only exists in Ubuntu 18.04 - we can enable it in 20.04 again.
Signed-off-by Thomas Huth <[email protected]>
--- tests/docker/dockerfiles/ubuntu2004.docker | 3 --- 1 file changed, 3 deletions(-)
tests/docker/dockerfiles/ubuntu2004.docker +0 -3
@@ -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
Signature · 1 line
2.18.1
Quoted 14 lines · Thomas Huth
The libssh problem only exists in Ubuntu 18.04 - we can enable it in 20.04 again.
Signed-off-by Thomas Huth <[email protected]>--- tests/docker/dockerfiles/ubuntu2004.docker | 3 --- 1 file changed, 3 deletions(-)tests/docker/dockerfiles/ubuntu2004.docker +0
-0
tests/docker/dockerfiles/ubuntu2004.docker RUN apt-get update && \ · line 70
Quoted 9 lines
tests/docker/dockerfiles/ubuntu2004.docker +0
-3@@ -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
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Alex Bennée
AppliedQuoted 2 lines · Thomas Huth
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.
Quoted 20 lines
Signed-off-by Thomas Huth <[email protected]>--- tests/docker/dockerfiles/ubuntu2004.docker | 3 --- 1 file changed, 3 deletions(-)tests/docker/dockerfiles/ubuntu2004.docker +0
-3@@ -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
Signature · 1 line
Alex Bennée