* [RFC PATCH] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
@ 2020-07-13 18:52 Thomas Huth
2020-07-13 19:34 ` Philippe Mathieu-Daudé
2020-07-13 19:53 ` Alex Bennée
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2020-07-13 18:52 UTC (permalink / raw)
To: Alex Bennée, qemu-devel; +Cc: Fam Zheng, Philippe Mathieu-Daudé
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>
---
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
--
2.18.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC PATCH] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
2020-07-13 18:52 [RFC PATCH] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image Thomas Huth
@ 2020-07-13 19:34 ` Philippe Mathieu-Daudé
2020-07-13 19:53 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-13 19:34 UTC (permalink / raw)
To: Thomas Huth, Alex Bennée, qemu-devel; +Cc: Fam Zheng
On 7/13/20 8:52 PM, Thomas Huth wrote:
> 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>
> ---
> 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
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC PATCH] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
2020-07-13 18:52 [RFC PATCH] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image Thomas Huth
2020-07-13 19:34 ` Philippe Mathieu-Daudé
@ 2020-07-13 19:53 ` Alex Bennée
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2020-07-13 19:53 UTC (permalink / raw)
To: Thomas Huth; +Cc: Fam Zheng, Philippe Mathieu-Daudé, qemu-devel
Thomas Huth <thuth@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 <thuth@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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-13 19:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-13 18:52 [RFC PATCH] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image Thomas Huth
2020-07-13 19:34 ` Philippe Mathieu-Daudé
2020-07-13 19:53 ` Alex Bennée
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).