From: "Daniel P. Berrangé" <berrange@redhat.com>
To: marcandre.lureau@redhat.com
Cc: qemu-devel@nongnu.org, "Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Ed Maste" <emaste@freebsd.org>, "Thomas Huth" <thuth@redhat.com>,
"Li-Wen Hsu" <lwhsu@freebsd.org>,
"Yonggang Luo" <luoyonggang@gmail.com>,
"Warner Losh" <imp@bsdimp.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Kohei Tokunaga" <ktokunaga.mail@gmail.com>,
"Kyle Evans" <kevans@freebsd.org>
Subject: Re: [PATCH 10/24] lcitool: update, switch to f41
Date: Fri, 19 Sep 2025 15:10:05 +0100 [thread overview]
Message-ID: <aM1kPctSIksuJsfd@redhat.com> (raw)
In-Reply-To: <20250919133320.240145-11-marcandre.lureau@redhat.com>
On Fri, Sep 19, 2025 at 05:33:04PM +0400, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 3 ++-
> scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 3 ++-
> tests/docker/dockerfiles/alpine.docker | 2 +-
> tests/docker/dockerfiles/debian-amd64-cross.docker | 5 ++++-
> tests/docker/dockerfiles/debian-arm64-cross.docker | 5 ++++-
> tests/docker/dockerfiles/debian-armhf-cross.docker | 5 ++++-
> tests/docker/dockerfiles/debian-i686-cross.docker | 5 ++++-
> .../dockerfiles/debian-mips64el-cross.docker | 5 ++++-
> .../docker/dockerfiles/debian-mipsel-cross.docker | 5 ++++-
> .../docker/dockerfiles/debian-ppc64el-cross.docker | 5 ++++-
> .../docker/dockerfiles/debian-riscv64-cross.docker | 8 ++++++--
> tests/docker/dockerfiles/debian-s390x-cross.docker | 5 ++++-
> tests/docker/dockerfiles/debian.docker | 5 ++++-
> .../docker/dockerfiles/fedora-rust-nightly.docker | 14 ++++++++------
> tests/docker/dockerfiles/fedora-win64-cross.docker | 11 +++++++----
> tests/docker/dockerfiles/fedora.docker | 14 ++++++++------
> tests/docker/dockerfiles/opensuse-leap.docker | 4 ++--
> tests/docker/dockerfiles/ubuntu2204.docker | 5 ++++-
> tests/lcitool/projects/qemu.yml | 1 -
> tests/lcitool/refresh | 6 +++---
> 20 files changed, 79 insertions(+), 37 deletions(-)
This is presumably where the submodule updat from earlier
should have been.
>
> diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
> index f11e980826..bbcb5dd4ac 100644
> --- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
> +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
> @@ -95,7 +95,6 @@ packages:
> - llvm
> - locales
> - make
> - - meson
> - mtools
> - multipath-tools
> - ncat
> @@ -108,10 +107,12 @@ packages:
> - python3-opencv
> - python3-pillow
> - python3-pip
> + - python3-setuptools
> - python3-sphinx
> - python3-sphinx-rtd-theme
> - python3-tomli
> - python3-venv
> + - python3-wheel
> - python3-yaml
> - rpm2cpio
> - rustc-1.77
> diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
> index 6559cb2934..00eb1b0f91 100644
> --- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
> +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
> @@ -93,7 +93,6 @@ packages:
> - llvm
> - locales
> - make
> - - meson
> - mtools
> - multipath-tools
> - ncat
> @@ -106,10 +105,12 @@ packages:
> - python3-opencv
> - python3-pillow
> - python3-pip
> + - python3-setuptools
> - python3-sphinx
> - python3-sphinx-rtd-theme
> - python3-tomli
> - python3-venv
> + - python3-wheel
> - python3-yaml
> - rpm2cpio
> - rustc-1.77
> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
> index bf3bd5a30d..bd1ef5505d 100644
> --- a/tests/docker/dockerfiles/alpine.docker
> +++ b/tests/docker/dockerfiles/alpine.docker
> @@ -78,7 +78,7 @@ RUN apk update && \
> nmap-ncat \
> numactl-dev \
> openssh-client \
> - pcre-dev \
> + pcre2-dev \
> pipewire-dev \
> pixman-dev \
> pkgconf \
> diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
> index 081f3e00f7..bba6de4e2d 100644
> --- a/tests/docker/dockerfiles/debian-amd64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
> index 91c555a36e..8bbcd75157 100644
> --- a/tests/docker/dockerfiles/debian-arm64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
> index f0e2efcda0..455b84424c 100644
> --- a/tests/docker/dockerfiles/debian-armhf-cross.docker
> +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
> index 025beb1ce2..8b8993ffe4 100644
> --- a/tests/docker/dockerfiles/debian-i686-cross.docker
> +++ b/tests/docker/dockerfiles/debian-i686-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
> index 4a941dd870..c89cb6c680 100644
> --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> index 4d3e5d711b..4e10d9501f 100644
> --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> index 22b4457ba9..cf61cb7f4a 100644
> --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
> index b0386cd3a1..79ec37616d 100644
> --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
> @@ -4,7 +4,7 @@
> #
> # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM docker.io/library/debian:trixie-slim
> +FROM docker.io/library/debian:13-slim
>
> RUN export DEBIAN_FRONTEND=noninteractive && \
> apt-get update && \
> @@ -23,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> libglib2.0-dev \
> locales \
> make \
> - meson \
> ninja-build \
> pkgconf \
> python3 \
> + python3-pip \
> + python3-setuptools \
> python3-venv \
> + python3-wheel \
> sed \
> tar && \
> eatmydata apt-get autoremove -y && \
> @@ -36,6 +38,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
> index 13ec52c8ad..1782e0e90f 100644
> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
> @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> ncat \
> ninja-build \
> @@ -45,9 +44,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -67,6 +68,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
> index 0a57c1a1d3..62f89e4d8c 100644
> --- a/tests/docker/dockerfiles/debian.docker
> +++ b/tests/docker/dockerfiles/debian.docker
> @@ -104,7 +104,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> multipath-tools \
> ncat \
> @@ -117,9 +116,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-web \
> @@ -146,6 +147,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker
> index 4a033309b3..fd71dd8790 100644
> --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker
> +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
> @@ -1,10 +1,10 @@
> # THIS FILE WAS AUTO-GENERATED
> #
> -# $ lcitool dockerfile --layers all fedora-40 qemu
> +# $ lcitool dockerfile --layers all fedora-41 qemu
> #
> # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM registry.fedoraproject.org/fedora:40
> +FROM registry.fedoraproject.org/fedora:41
>
> RUN dnf install -y nosync && \
> printf '#!/bin/sh\n\
> @@ -91,7 +91,6 @@ exec "$@"\n' > /usr/bin/nosync && \
> lzo-devel \
> make \
> mesa-libgbm-devel \
> - meson \
> mtools \
> ncurses-devel \
> nettle-devel \
> @@ -100,7 +99,7 @@ exec "$@"\n' > /usr/bin/nosync && \
> numactl-devel \
> openssh-clients \
> pam-devel \
> - pcre-static \
> + pcre2-static \
> pipewire-devel \
> pixman-devel \
> pkgconfig \
> @@ -111,9 +110,10 @@ exec "$@"\n' > /usr/bin/nosync && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx_rtd_theme \
> - python3-zombie-imp \
> + python3-wheel \
> rdma-core-devel \
> rust \
> sed \
> @@ -124,7 +124,7 @@ exec "$@"\n' > /usr/bin/nosync && \
> spice-server-devel \
> swtpm \
> systemd-devel \
> - systemtap-sdt-devel \
> + systemtap-sdt-dtrace \
> tar \
> tesseract \
> tesseract-langpack-eng \
> @@ -148,6 +148,8 @@ exec "$@"\n' > /usr/bin/nosync && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
> index a950344402..ed7d270984 100644
> --- a/tests/docker/dockerfiles/fedora-win64-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
> @@ -1,10 +1,10 @@
> # THIS FILE WAS AUTO-GENERATED
> #
> -# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-40 qemu,qemu-win-installer
> +# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-41 qemu,qemu-win-installer
> #
> # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM registry.fedoraproject.org/fedora:40
> +FROM registry.fedoraproject.org/fedora:41
>
> RUN dnf install -y nosync && \
> printf '#!/bin/sh\n\
> @@ -38,7 +38,6 @@ exec "$@"\n' > /usr/bin/nosync && \
> hostname \
> llvm \
> make \
> - meson \
> mtools \
> ninja-build \
> nmap-ncat \
> @@ -49,9 +48,10 @@ exec "$@"\n' > /usr/bin/nosync && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx_rtd_theme \
> - python3-zombie-imp \
> + python3-wheel \
> rust \
> sed \
> socat \
> @@ -69,6 +69,8 @@ exec "$@"\n' > /usr/bin/nosync && \
> nosync dnf clean all -y && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> @@ -90,6 +92,7 @@ RUN nosync dnf install -y \
> mingw64-gtk-vnc2 \
> mingw64-gtk3 \
> mingw64-libepoxy \
> + mingw64-libfdt \
> mingw64-libgcrypt \
> mingw64-libjpeg-turbo \
> mingw64-libpng \
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 014e3ccf17..e367c53c09 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -1,10 +1,10 @@
> # THIS FILE WAS AUTO-GENERATED
> #
> -# $ lcitool dockerfile --layers all fedora-40 qemu
> +# $ lcitool dockerfile --layers all fedora-41 qemu
> #
> # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM registry.fedoraproject.org/fedora:40
> +FROM registry.fedoraproject.org/fedora:41
>
> RUN dnf install -y nosync && \
> printf '#!/bin/sh\n\
> @@ -91,7 +91,6 @@ exec "$@"\n' > /usr/bin/nosync && \
> lzo-devel \
> make \
> mesa-libgbm-devel \
> - meson \
> mtools \
> ncurses-devel \
> nettle-devel \
> @@ -100,7 +99,7 @@ exec "$@"\n' > /usr/bin/nosync && \
> numactl-devel \
> openssh-clients \
> pam-devel \
> - pcre-static \
> + pcre2-static \
> pipewire-devel \
> pixman-devel \
> pkgconfig \
> @@ -111,9 +110,10 @@ exec "$@"\n' > /usr/bin/nosync && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx_rtd_theme \
> - python3-zombie-imp \
> + python3-wheel \
> rdma-core-devel \
> rust \
> sed \
> @@ -124,7 +124,7 @@ exec "$@"\n' > /usr/bin/nosync && \
> spice-server-devel \
> swtpm \
> systemd-devel \
> - systemtap-sdt-devel \
> + systemtap-sdt-dtrace \
> tar \
> tesseract \
> tesseract-langpack-eng \
> @@ -148,6 +148,8 @@ exec "$@"\n' > /usr/bin/nosync && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> index e90225dc23..60763857bb 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -89,7 +89,7 @@ RUN zypper update -y && \
> ninja \
> openssh \
> pam-devel \
> - pcre-devel-static \
> + pcre2-devel-static \
> pipewire-devel \
> pkgconfig \
> python311 \
> @@ -132,7 +132,7 @@ RUN zypper update -y && \
>
> RUN /usr/bin/pip3.11 install \
> PyYAML \
> - meson==1.5.0 \
> + meson==1.8.1 \
> pillow \
> sphinx \
> sphinx-rtd-theme
> diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
> index 28a6f93243..ea67c7602a 100644
> --- a/tests/docker/dockerfiles/ubuntu2204.docker
> +++ b/tests/docker/dockerfiles/ubuntu2204.docker
> @@ -102,7 +102,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> llvm \
> locales \
> make \
> - meson \
> mtools \
> multipath-tools \
> ncat \
> @@ -115,10 +114,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> + python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-tomli \
> python3-venv \
> + python3-wheel \
> python3-yaml \
> rpm2cpio \
> rustc-1.77 \
> @@ -145,6 +146,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
> ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
>
> +RUN /usr/bin/pip3 install meson==1.8.1
> +
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
> index c07242f272..f22fc46fdc 100644
> --- a/tests/lcitool/projects/qemu.yml
> +++ b/tests/lcitool/projects/qemu.yml
> @@ -91,7 +91,6 @@ packages:
> - pkg-config
> - pulseaudio
> - python3
> - - python3-imp
> - python3-numpy
> - python3-opencv
> - python3-pillow
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index d3488b2679..f49eb638f8 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -171,7 +171,7 @@ try:
> generate_dockerfile("centos9", "centos-stream-9")
> generate_dockerfile("debian", "debian-12",
> trailer="".join(debian12_extras))
> - generate_dockerfile("fedora", "fedora-40")
> + generate_dockerfile("fedora", "fedora-41")
> generate_dockerfile("opensuse-leap", "opensuse-leap-15")
> generate_dockerfile("ubuntu2204", "ubuntu-2204",
> trailer="".join(ubuntu2204_rust_extras))
> @@ -179,7 +179,7 @@ try:
> #
> # Non-fatal Rust-enabled build
> #
> - generate_dockerfile("fedora-rust-nightly", "fedora-40",
> + generate_dockerfile("fedora-rust-nightly", "fedora-41",
> trailer="".join(fedora_rustup_nightly_extras))
>
> #
> @@ -237,7 +237,7 @@ try:
> trailer=cross_build("s390x-linux-gnu-",
> "s390x-softmmu,s390x-linux-user"))
>
> - generate_dockerfile("fedora-win64-cross", "fedora-40",
> + generate_dockerfile("fedora-win64-cross", "fedora-41",
> project='qemu,qemu-win-installer',
> cross="mingw64",
> trailer=cross_build("x86_64-w64-mingw32-",
> --
> 2.51.0
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2025-09-19 14:11 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-19 13:32 [PATCH 00/24] CI/build-sys fixes to enable Rust more widely marcandre.lureau
2025-09-19 13:32 ` [PATCH 01/24] gitlab-ci: fix 'needs' property type must be array marcandre.lureau
2025-09-19 14:05 ` Daniel P. Berrangé
2025-09-19 13:32 ` [PATCH 02/24] scripts/archive-source: speed up downloading subprojects marcandre.lureau
2025-09-19 13:50 ` Daniel P. Berrangé
2025-09-22 6:59 ` Marc-André Lureau
2025-09-22 8:08 ` Daniel P. Berrangé
2025-09-22 8:30 ` Paolo Bonzini
2025-09-19 13:32 ` [PATCH 03/24] scripts/archive-source: silence subprojects downloads marcandre.lureau
2025-09-19 13:49 ` Daniel P. Berrangé
2025-09-19 13:32 ` [PATCH 04/24] configure: fix rust meson configuration marcandre.lureau
2025-09-19 14:06 ` Daniel P. Berrangé
2025-09-19 13:32 ` [PATCH 05/24] configure: set the bindgen cross target marcandre.lureau
2025-09-19 15:08 ` Paolo Bonzini
2025-09-19 13:33 ` [PATCH 06/24] RFC: configure: use the same machine as the host triple by default marcandre.lureau
2025-09-19 15:11 ` Paolo Bonzini
2025-09-19 22:27 ` Paolo Bonzini
2025-09-19 13:33 ` [PATCH 07/24] tests/docker/common: print errors to stderr marcandre.lureau
2025-09-19 14:07 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 08/24] tests/docker: use fully qualified image name for emsdk marcandre.lureau
2025-09-19 14:08 ` Daniel P. Berrangé
2025-09-21 3:19 ` Kohei Tokunaga
2025-09-19 13:33 ` [PATCH 09/24] tests/docker/common: print meson log on configure failure marcandre.lureau
2025-09-19 14:09 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 10/24] lcitool: update, switch to f41 marcandre.lureau
2025-09-19 14:10 ` Daniel P. Berrangé [this message]
2025-09-19 13:33 ` [PATCH 11/24] lcitool/qemu: include libclang-rt for TSAN marcandre.lureau
2025-09-19 14:10 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 12/24] lcitool/alpine: workaround bindgen issue marcandre.lureau
2025-09-19 14:10 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 13/24] tests/lcitool: add missing rust-std dep marcandre.lureau
2025-09-19 14:11 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 14/24] tests: move mips to debian-legacy-test-cross marcandre.lureau
2025-09-19 14:21 ` Daniel P. Berrangé
2025-09-22 8:38 ` Marc-André Lureau
2025-09-22 9:06 ` Daniel P. Berrangé
2025-09-22 9:44 ` Alex Bennée
2025-09-22 15:10 ` Paolo Bonzini
2025-09-22 16:40 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 15/24] tests/lcitool: update to debian13 marcandre.lureau
2025-09-19 14:21 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 16/24] build-sys: cfi_debug and safe_stack are not compatible marcandre.lureau
2025-09-19 14:25 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 17/24] tests/docker: add ENABLE_RUST environment marcandre.lureau
2025-09-19 14:37 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 18/24] tests/lcitool: enable rust & refresh marcandre.lureau
2025-09-19 14:39 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 19/24] configure: set the meson executable suffix/ext marcandre.lureau
2025-09-19 14:41 ` Daniel P. Berrangé
2025-09-22 10:34 ` Marc-André Lureau
2025-09-22 10:40 ` Daniel P. Berrangé
2025-09-22 10:45 ` Marc-André Lureau
2025-09-19 13:33 ` [PATCH 20/24] tests/freebsd: enable Rust marcandre.lureau
2025-09-19 14:41 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 21/24] meson: rust-bindgen limit allowlist-file to srcdir/include marcandre.lureau
2025-09-19 13:33 ` [PATCH 22/24] WIP: tests/docker: add rust to debian-legacy-test-cross marcandre.lureau
2025-09-19 14:43 ` Daniel P. Berrangé
2025-09-19 13:33 ` [PATCH 23/24] WIP: gitlab-ci: enable rust for msys2-64bit marcandre.lureau
2025-09-19 13:33 ` [PATCH 24/24] WIP: cirrus/macos: enable Rust marcandre.lureau
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=aM1kPctSIksuJsfd@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=emaste@freebsd.org \
--cc=imp@bsdimp.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kevans@freebsd.org \
--cc=ktokunaga.mail@gmail.com \
--cc=luoyonggang@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@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.