All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org,
	aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com,
	crosa@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>, "Ed Maste" <emaste@freebsd.org>,
	"Li-Wen Hsu" <lwhsu@freebsd.org>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>
Subject: [PATCH  v2 24/30] tests/lcitool: bump to latest version
Date: Wed, 14 Sep 2022 16:59:44 +0100	[thread overview]
Message-ID: <20220914155950.804707-25-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org>

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: <20220826172128.353798-19-alex.bennee@linaro.org>

---
v2
  - expand commit re:libslirp
---
 .gitlab-ci.d/cirrus/freebsd-12.vars           | 2 +-
 .gitlab-ci.d/cirrus/freebsd-13.vars           | 2 +-
 tests/docker/dockerfiles/opensuse-leap.docker | 3 ++-
 tests/docker/dockerfiles/ubuntu2004.docker    | 2 +-
 tests/lcitool/libvirt-ci                      | 2 +-
 5 files changed, 6 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..041cf9c1ff 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 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..e3712b7912 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 324355cf62e86fb551408575afb123bac989ac37
+Subproject commit e3712b79122180fdb3b7a7ea8cbee47ece253f97
-- 
2.34.1



  parent reply	other threads:[~2022-09-14 16:47 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-14 15:59 [PATCH v2 00/30] testing/next pre-PR (testing update and mips deprecation) Alex Bennée
2022-09-14 15:59 ` [PATCH v2 01/30] gitlab: reduce targets in cross_user_build_job Alex Bennée
2022-09-15  8:21   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 02/30] tests/avocado/boot_linux_console: Fix the test_aarch64_xlnx_versal_virt test Alex Bennée
2022-09-14 15:59 ` [PATCH v2 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests Alex Bennée
2022-09-15  8:21   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 04/30] tests/avocado: add explicit timeout for s390 " Alex Bennée
2022-09-14 20:29   ` Thomas Huth
2022-09-14 15:59 ` [PATCH v2 05/30] tests/avocado: add explicit timeout for ppc64le " Alex Bennée
2022-09-15  8:22   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 06/30] tests/avocado: split the AST2x00Machine classes Alex Bennée
2022-09-15  8:24   ` Richard Henderson
2022-09-20 15:07     ` Alex Bennée
2022-09-14 15:59 ` [PATCH v2 07/30] tests/avocado: reduce the default timeout to 120s Alex Bennée
2022-09-15  8:24   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 08/30] tests/docker: update and flatten debian-alpha-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 09/30] tests/docker: update and flatten debian-hppa-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 10/30] tests/docker: update and flatten debian-m68k-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 11/30] tests/docker: update and flatten debian-mips64-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 12/30] tests/docker: update and flatten debian-sh4-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 13/30] tests/docker: update and flatten debian-sparc64-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 14/30] tests/docker: flatten debian-powerpc-test-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 15/30] tests/docker: remove tricore qemu/debian10 dependency Alex Bennée
2022-09-15  7:40   ` Thomas Huth
2022-09-14 15:59 ` [PATCH v2 16/30] tests/docker: remove amd64 " Alex Bennée
2022-09-14 15:59 ` [PATCH v2 17/30] tests/vm: Remove obsolete Fedora VM test Alex Bennée
2022-09-14 15:59 ` [PATCH v2 18/30] configure: explicitly set cflags for --disable-pie Alex Bennée
2022-09-15  8:27   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64 Alex Bennée
2022-09-15  7:41   ` Thomas Huth
2022-09-14 15:59 ` [PATCH v2 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs Alex Bennée
2022-09-15  7:42   ` Thomas Huth
2022-09-14 15:59 ` [PATCH v2 21/30] Deprecate 32 bit big-endian MIPS Alex Bennée
2022-09-15  8:34   ` Richard Henderson
2022-09-16  8:08     ` Pierre Muller
2022-09-16  8:38       ` Richard Henderson
2022-09-16 10:10         ` Pierre Muller
2022-09-16 10:22           ` Daniel P. Berrangé
2022-09-16 15:20             ` Philippe Mathieu-Daudé via
2022-09-16  9:33       ` Alex Bennée
2022-09-14 15:59 ` [PATCH v2 22/30] tests/docker: flatten debian-riscv64-test-cross Alex Bennée
2022-09-15  8:35   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 23/30] tests/docker: update and flatten debian-all-test-cross Alex Bennée
2022-09-15  8:36   ` Richard Henderson
2022-09-14 15:59 ` Alex Bennée [this message]
2022-09-14 15:59 ` [PATCH v2 25/30] tests/docker: update and flatten debian-amd64-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 26/30] tests/docker: update and flatten debian-loongarch-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 27/30] tests/docker: update and flatten debian-hexagon-cross Alex Bennée
2022-09-15  8:39   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 28/30] tests/docker: update and flatten debian-toolchain Alex Bennée
2022-09-15  8:40   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 29/30] tests/docker: remove FROM qemu/ support from docker.py Alex Bennée
2022-09-15  8:41   ` Richard Henderson
2022-10-29  9:38     ` Stefan Weil via
2022-10-29 19:46       ` Paolo Bonzini
2022-10-29 21:13         ` Stefan Weil via
2022-10-30 14:17           ` Paolo Bonzini
2022-09-14 15:59 ` [PATCH v2 30/30] tests/docker: remove the Debian base images Alex Bennée
2022-09-15  8:42   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220914155950.804707-25-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=emaste@freebsd.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=lwhsu@freebsd.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.