From: Alex Bennée Date: Wed, 4 Sep 2019 18:07:14 +0000 (+0100) Subject: tests/docker: --disable-libssh on ubuntu1804 builds X-Git-Tag: v4.2.0-rc0~115^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50d2dcaddb6bafe0ae466328c2bfa521e78ab833;p=thirdparty%2Fqemu.git 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 Reviewed-by: Philippe Mathieu-Daudé --- diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 44bbf0f77ae..883f9bcf31c 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