Skip to contentSkip to conversation

tests/docker: Remove the libssh workaround from the ubuntu 20.04 image

RFC PATCH Applied Thomas Huth 3 participants 3 messages Jul 13, 2020

lore
Share & tools
lore
#0 lore raw

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.

---
 tests/docker/dockerfiles/ubuntu2004.docker | 3 ---
 1 file changed, 3 deletions(-)
tests/docker/dockerfiles/ubuntu2004.docker +0 -3
index f7aac840bf..8d10934a2a 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Thomas Huth

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

---
 tests/docker/dockerfiles/ubuntu2004.docker | 3 ---
 1 file changed, 3 deletions(-)
tests/docker/dockerfiles/ubuntu2004.docker +0 -0
index f7aac840bf..8d10934a2a 100644

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
Applied
#2 lore raw
In reply to Thomas Huth
Quoted 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
---
 tests/docker/dockerfiles/ubuntu2004.docker | 3 ---
 1 file changed, 3 deletions(-)
tests/docker/dockerfiles/ubuntu2004.docker +0 -3
index f7aac840bf..8d10934a2a 100644
@@ -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