diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2022-09-14 16:59:44 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2022-09-20 17:22:08 +0100 |
| commit | 8bb499955e26466b2b64f0736d77037a56fcddcb (patch) | |
| tree | d92ad5617ad1be2dfbf673aba15f9381f4821026 /tests/docker | |
| parent | b6fafe5b3e5eb555cf13f51cd5d08400c86dac96 (diff) | |
| download | qemu-8bb499955e26466b2b64f0736d77037a56fcddcb.zip qemu-8bb499955e26466b2b64f0736d77037a56fcddcb.tar.gz qemu-8bb499955e26466b2b64f0736d77037a56fcddcb.tar.bz2 | |
tests/lcitool: bump to latest version
We need this to be able to cleanly build the x86 cross images. There
are a few minor updates triggered by lcitool-refresh including adding
"libslirp" to the freebsd vars and opensuse-leap which will help when
we finally drop the slirp submodule from QEMU.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-25-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/opensuse-leap.docker | 3 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu2004.docker | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 047a435..041cf9c 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -66,6 +66,7 @@ RUN zypper update -y && \ librbd-devel \ libseccomp-devel \ libselinux-devel \ + libslirp-devel \ libspice-server-devel \ libssh-devel \ libtasn1-devel \ @@ -127,7 +128,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 99803b3..e1f4ed7 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" |