summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Bennée2019-09-04 20:07:14 +0200
committerAlex Bennée2019-09-10 15:14:31 +0200
commit50d2dcaddb6bafe0ae466328c2bfa521e78ab833 (patch)
treeed81d5bf4dac4dc8f4453967cde4a67bd1d9c0bc
parenttests/docker: add more images to PARTIAL_IMAGES when not on x86_64 (diff)
downloadqemu-50d2dcaddb6bafe0ae466328c2bfa521e78ab833.tar.gz
qemu-50d2dcaddb6bafe0ae466328c2bfa521e78ab833.tar.xz
qemu-50d2dcaddb6bafe0ae466328c2bfa521e78ab833.zip
tests/docker: --disable-libssh on ubuntu1804 builds
Currently this stops the mega: make docker-test-build from working. Once the source is patched to deal with the case this workaround can be removed. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-rw-r--r--tests/docker/dockerfiles/ubuntu1804.docker3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 44bbf0f77a..883f9bcf31 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -56,3 +56,6 @@ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
RUN dpkg -l $PACKAGES | sort > /packages.txt
ENV FEATURES clang pyyaml sdl2
+
+# https://bugs.launchpad.net/qemu/+bug/1838763
+ENV QEMU_CONFIGURE_OPTS --disable-libssh