From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
Date: Tue, 14 Jul 2020 10:52:41 +0100 [thread overview]
Message-ID: <20200714095247.19573-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200714095247.19573-1-alex.bennee@linaro.org>
From: Thomas Huth <thuth@redhat.com>
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>
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.20.1
next prev parent reply other threads:[~2020-07-14 9:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 9:52 [PULL 0/9] final misc fixes for 5.1-rc0 Alex Bennée
2020-07-14 9:52 ` [PULL 1/9] docs/devel: fix grammar in multi-thread-tcg Alex Bennée
2020-07-14 9:52 ` [PULL 2/9] configure: remove all dependencies on a (re)configure Alex Bennée
2020-07-14 9:52 ` Alex Bennée [this message]
2020-07-14 9:52 ` [PULL 4/9] docker.py: fix fetching of FROM layers Alex Bennée
2020-07-14 9:52 ` [PULL 5/9] gitlab-ci/containers: Add missing wildcard where we should look for changes Alex Bennée
2020-07-14 9:52 ` [PULL 6/9] fpu/softfloat: fix up float16 nan recognition Alex Bennée
2020-07-14 9:52 ` [PULL 7/9] tests/plugins: don't unconditionally add -Wpsabi Alex Bennée
2020-07-14 9:52 ` [PULL 8/9] cputlb: ensure we save the IOTLB data in case of reset Alex Bennée
2020-07-14 9:52 ` [PULL 9/9] plugins: expand the bb plugin to be thread safe and track per-cpu Alex Bennée
2020-07-15 8:06 ` [PULL 0/9] final misc fixes for 5.1-rc0 Peter Maydell
2020-07-15 10:51 ` Alex Bennée
2020-07-15 12:29 ` Philippe Mathieu-Daudé
2020-07-15 12:51 ` Peter Maydell
2020-07-15 12:54 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200714095247.19573-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).