diff mbox series

[v1,41/42] tests/docker: --disable-libssh on ubuntu1804 builds

Message ID 20190904203013.9028-42-alex.bennee@linaro.org
State Superseded
Headers show
Series current testing/next queue (podman, docker, ci) | expand

Commit Message

Alex Bennée Sept. 4, 2019, 8:30 p.m. UTC 
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>

---
 tests/docker/dockerfiles/ubuntu1804.docker | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé Sept. 5, 2019, 10:32 a.m. UTC | #1 
On 9/4/19 10:30 PM, Alex Bennée wrote:
> 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>

> ---

>  tests/docker/dockerfiles/ubuntu1804.docker | 3 +++

>  1 file changed, 3 insertions(+)

> 

> 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

> 


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff mbox series

Patch

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