qemu-stable
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH stable-7.2 21/23] tests: update lcitool to fix freebsd py311-yaml


From: Thomas Huth
Subject: [PATCH stable-7.2 21/23] tests: update lcitool to fix freebsd py311-yaml rename
Date: Tue, 3 Dec 2024 11:53:44 +0100

From: Daniel P. Berrangé <berrange@redhat.com>

This addresses the py311-yaml -> py311-pyyaml rename in FreeBSD.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20241014130255.10119-1-berrange@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
(cherry picked from commit aa54f5be44be786636a5d51cc1612ad208a24849)
Conflicts:
        tests/lcitool/libvirt-ci
        tests/vm/generated/freebsd.json
        (dropped changes in files with conflicts due to missing other patches)
[thuth: Skip the change to the opensuse file to avoid breakage]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/cirrus/freebsd-14.vars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars 
b/.gitlab-ci.d/cirrus/freebsd-14.vars
index aba0eff4b9..c0655b21e9 100644
--- a/.gitlab-ci.d/cirrus/freebsd-14.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-14.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 bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl 
cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls 
gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs 
libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle 
ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-sphinx 
py311-sphinx_rtd_theme py311-tomli py311-yaml python3 rpm2cpio sdl2 sdl2_image 
snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso 
zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cmocka ctags curl 
cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls 
gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs 
libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle 
ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml 
py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio sdl2 
sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer 
vte3 xorriso zstd'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
-- 
2.47.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]