On 26/08/2022 19.21, Alex Bennée wrote:
> We need this to be able to cleanly build the x86 cross images. There
> are a few minor updates triggered by lcitool-refresh.
Maybe mention that this will add "libslirp" to the freebsd vars - which will
be helpful when we finally remove the slirp submodule from QEMU (thanks to
Daniel for refreshing lcitool for this!).
Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
> tests/docker/dockerfiles/opensuse-leap.docker | 2 +-
> tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
> tests/lcitool/libvirt-ci | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
> index 8fa5a320e9..1a5959810f 100644
> --- a/.gitlab-ci.d/cirrus/freebsd-12.vars
> +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars
> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
> NINJA='/usr/local/bin/ninja'
> PACKAGING_COMMAND='pkg'
> PIP3='/usr/local/bin/pip-3.8'
> -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
> +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
> PYPI_PKGS=''
> PYTHON='/usr/local/bin/python3'
> diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars
> index 8ed7e33a77..5e5aafd7e5 100644
> --- a/.gitlab-ci.d/cirrus/freebsd-13.vars
> +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
> NINJA='/usr/local/bin/ninja'
> PACKAGING_COMMAND='pkg'
> PIP3='/usr/local/bin/pip-3.8'
> -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
> +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
> PYPI_PKGS=''
> PYTHON='/usr/local/bin/python3'
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> index 047a435ab5..193df305af 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -127,7 +127,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 99803b343b..e1f4ed7c80 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"
> diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
> index 324355cf62..be7d1f2c7f 160000
> --- a/tests/lcitool/libvirt-ci
> +++ b/tests/lcitool/libvirt-ci
> @@ -1 +1 @@
> -Subproject commit 324355cf62e86fb551408575afb123bac989ac37
> +Subproject commit be7d1f2c7fb8c1462592b96c15c4358285d37230