From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
.../dockerfiles/debian-amd64-cross.docker | 9 +++++----
.../dockerfiles/debian-arm64-cross.docker | 9 +++++----
.../dockerfiles/debian-armhf-cross.docker | 12 +++++------
.../dockerfiles/debian-i686-cross.docker | 11 +++++-----
.../dockerfiles/debian-ppc64el-cross.docker | 9 +++++----
.../dockerfiles/debian-s390x-cross.docker | 9 +++++----
tests/docker/dockerfiles/debian.docker | 9 +++++----
tests/lcitool/refresh | 20 ++++++++++---------
8 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index f3ad2205a7..08621879dd 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-12 qemu
+# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
@@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get install --no-install-recommends -y \
gcc-x86-64-linux-gnu \
libaio-dev:amd64 \
- libasan6:amd64 \
+ libasan8:amd64 \
libasound2-dev:amd64 \
libattr1-dev:amd64 \
libbpf-dev:amd64 \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 7d42227fa1..725cccbee1 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-12 qemu
+# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
@@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get install --no-install-recommends -y \
gcc-aarch64-linux-gnu \
libaio-dev:arm64 \
- libasan6:arm64 \
+ libasan8:arm64 \
libasound2-dev:arm64 \
libattr1-dev:arm64 \
libbpf-dev:arm64 \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 8ad4d2bebf..50f7e0e986 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch armv7l debian-12 qemu
+# $ lcitool dockerfile --layers all --cross-arch armv7l debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
@@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get install --no-install-recommends -y \
gcc-arm-linux-gnueabihf \
libaio-dev:armhf \
- libasan6:armhf \
+ libasan8:armhf \
libasound2-dev:armhf \
libattr1-dev:armhf \
libbpf-dev:armhf \
@@ -107,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libgbm-dev:armhf \
libgcrypt20-dev:armhf \
libglib2.0-dev:armhf \
- libglusterfs-dev:armhf \
libgnutls28-dev:armhf \
libgtk-3-dev:armhf \
libgtk-vnc-2.0-dev:armhf \
@@ -127,7 +127,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libpixman-1-dev:armhf \
libpng-dev:armhf \
libpulse-dev:armhf \
- librbd-dev:armhf \
librdmacm-dev:armhf \
libsasl2-dev:armhf \
libsdl2-dev:armhf \
@@ -152,7 +151,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvirglrenderer-dev:armhf \
libvte-2.91-dev:armhf \
libxdp-dev:armhf \
- libxen-dev:armhf \
libzstd-dev:armhf \
nettle-dev:armhf \
systemtap-sdt-dev:armhf \
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index e7e8d8e0f1..f53b77cb62 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch i686 debian-12 qemu
+# $ lcitool dockerfile --layers all --cross-arch i686 debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
@@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get install --no-install-recommends -y \
gcc-i686-linux-gnu \
libaio-dev:i386 \
- libasan6:i386 \
+ libasan8:i386 \
libasound2-dev:i386 \
libattr1-dev:i386 \
libbpf-dev:i386 \
@@ -107,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libgbm-dev:i386 \
libgcrypt20-dev:i386 \
libglib2.0-dev:i386 \
- libglusterfs-dev:i386 \
libgnutls28-dev:i386 \
libgtk-3-dev:i386 \
libgtk-vnc-2.0-dev:i386 \
@@ -127,7 +127,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libpixman-1-dev:i386 \
libpng-dev:i386 \
libpulse-dev:i386 \
- librbd-dev:i386 \
librdmacm-dev:i386 \
libsasl2-dev:i386 \
libsdl2-dev:i386 \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 97ef64d934..09de265c26 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-12 qemu
+# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
@@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get install --no-install-recommends -y \
gcc-powerpc64le-linux-gnu \
libaio-dev:ppc64el \
- libasan6:ppc64el \
+ libasan8:ppc64el \
libasound2-dev:ppc64el \
libattr1-dev:ppc64el \
libbpf-dev:ppc64el \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 3afe91494d..d7b2ca99ce 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch s390x debian-12 qemu
+# $ lcitool dockerfile --layers all --cross-arch s390x debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
@@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get install --no-install-recommends -y \
gcc-s390x-linux-gnu \
libaio-dev:s390x \
- libasan6:s390x \
+ libasan8:s390x \
libasound2-dev:s390x \
libattr1-dev:s390x \
libbpf-dev:s390x \
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index f68fcc83a9..2696cf2167 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all debian-12 qemu
+# $ lcitool dockerfile --layers all debian-13 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:12-slim
+FROM docker.io/library/debian:13-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
hostname \
libaio-dev \
- libasan6 \
+ libasan8 \
libasound2-dev \
libattr1-dev \
libbpf-dev \
@@ -121,11 +121,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
+ python3-tomli \
python3-venv \
python3-wheel \
python3-yaml \
rpm2cpio \
- rustc-web \
+ rustc \
sed \
socat \
sparse \
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 6f98a91277..f4d2721178 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -105,7 +105,7 @@ alpine_extras = [
# Netmap still needs to be manually built as it is yet to be packaged
# into a distro. We also add cscope and gtags which are used in the CI
# test
-debian12_extras = [
+debian13_extras = [
"# netmap/cscope/global\n",
"RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
" apt install -y --no-install-recommends \\\n",
@@ -175,8 +175,8 @@ try:
generate_dockerfile("alpine", "alpine-321",
trailer="".join(alpine_extras))
generate_dockerfile("centos9", "centos-stream-9")
- generate_dockerfile("debian", "debian-12",
- trailer="".join(debian12_extras))
+ generate_dockerfile("debian", "debian-13",
+ trailer="".join(debian13_extras))
generate_dockerfile("fedora", "fedora-41")
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2204", "ubuntu-2204",
@@ -191,30 +191,32 @@ try:
#
# Cross compiling builds
#
- generate_dockerfile("debian-amd64-cross", "debian-12",
+ generate_dockerfile("debian-amd64-cross", "debian-13",
cross="x86_64",
trailer=cross_build("x86_64-linux-gnu-",
"x86_64-softmmu,"
"x86_64-linux-user,"
"i386-softmmu,i386-linux-user"))
- generate_dockerfile("debian-arm64-cross", "debian-12",
+ generate_dockerfile("debian-arm64-cross", "debian-13",
cross="aarch64",
trailer=cross_build("aarch64-linux-gnu-",
"aarch64-softmmu,aarch64-linux-user"))
- generate_dockerfile("debian-armhf-cross", "debian-12",
+ generate_dockerfile("debian-armhf-cross", "debian-13",
cross="armv7l",
trailer=cross_build("arm-linux-gnueabihf-",
"arm-softmmu,arm-linux-user"))
- generate_dockerfile("debian-i686-cross", "debian-12",
+ generate_dockerfile("debian-i686-cross", "debian-13",
cross="i686",
trailer=cross_build("i686-linux-gnu-",
"x86_64-softmmu,"
"x86_64-linux-user,"
"i386-softmmu,i386-linux-user"))
+ # mips no longer supported in debian-13
+ # https://www.debian.org/releases/trixie/release-notes/issues.html#mips-architectures-removed
generate_dockerfile("debian-mips64el-cross", "debian-12",
cross="mips64el",
trailer=cross_build("mips64el-linux-gnuabi64-",
@@ -225,7 +227,7 @@ try:
trailer=cross_build("mipsel-linux-gnu-",
"mipsel-softmmu,mipsel-linux-user"))
- generate_dockerfile("debian-ppc64el-cross", "debian-12",
+ generate_dockerfile("debian-ppc64el-cross", "debian-13",
cross="ppc64le",
trailer=cross_build("powerpc64le-linux-gnu-",
"ppc64-softmmu,ppc64-linux-user"))
@@ -238,7 +240,7 @@ try:
trailer=cross_build("riscv64-linux-gnu-",
"riscv64-softmmu,riscv64-linux-user"))
- generate_dockerfile("debian-s390x-cross", "debian-12",
+ generate_dockerfile("debian-s390x-cross", "debian-13",
cross="s390x",
trailer=cross_build("s390x-linux-gnu-",
"s390x-softmmu,s390x-linux-user"))
--
2.51.0
marcandre.lureau@redhat.com writes: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > --- > .../dockerfiles/debian-amd64-cross.docker | 9 +++++---- > .../dockerfiles/debian-arm64-cross.docker | 9 +++++---- > .../dockerfiles/debian-armhf-cross.docker | 12 +++++------ > .../dockerfiles/debian-i686-cross.docker | 11 +++++----- > .../dockerfiles/debian-ppc64el-cross.docker | 9 +++++---- > .../dockerfiles/debian-s390x-cross.docker | 9 +++++---- > tests/docker/dockerfiles/debian.docker | 9 +++++---- > tests/lcitool/refresh | 20 ++++++++++--------- > 8 files changed, 46 insertions(+), 42 deletions(-) > > diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker > index f3ad2205a7..08621879dd 100644 > --- a/tests/docker/dockerfiles/debian-amd64-cross.docker > +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-12 qemu > +# $ lcitool dockerfile --layers all --cross-arch x86_64 debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > @@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > eatmydata apt-get install --no-install-recommends -y \ > gcc-x86-64-linux-gnu \ > libaio-dev:amd64 \ > - libasan6:amd64 \ > + libasan8:amd64 \ > libasound2-dev:amd64 \ > libattr1-dev:amd64 \ > libbpf-dev:amd64 \ > diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker > index 7d42227fa1..725cccbee1 100644 > --- a/tests/docker/dockerfiles/debian-arm64-cross.docker > +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-12 qemu > +# $ lcitool dockerfile --layers all --cross-arch aarch64 debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > @@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > eatmydata apt-get install --no-install-recommends -y \ > gcc-aarch64-linux-gnu \ > libaio-dev:arm64 \ > - libasan6:arm64 \ > + libasan8:arm64 \ > libasound2-dev:arm64 \ > libattr1-dev:arm64 \ > libbpf-dev:arm64 \ > diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker > index 8ad4d2bebf..50f7e0e986 100644 > --- a/tests/docker/dockerfiles/debian-armhf-cross.docker > +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch armv7l debian-12 qemu > +# $ lcitool dockerfile --layers all --cross-arch armv7l debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > @@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > eatmydata apt-get install --no-install-recommends -y \ > gcc-arm-linux-gnueabihf \ > libaio-dev:armhf \ > - libasan6:armhf \ > + libasan8:armhf \ > libasound2-dev:armhf \ > libattr1-dev:armhf \ > libbpf-dev:armhf \ > @@ -107,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libgbm-dev:armhf \ > libgcrypt20-dev:armhf \ > libglib2.0-dev:armhf \ > - libglusterfs-dev:armhf \ > libgnutls28-dev:armhf \ > libgtk-3-dev:armhf \ > libgtk-vnc-2.0-dev:armhf \ > @@ -127,7 +127,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libpixman-1-dev:armhf \ > libpng-dev:armhf \ > libpulse-dev:armhf \ > - librbd-dev:armhf \ > librdmacm-dev:armhf \ > libsasl2-dev:armhf \ > libsdl2-dev:armhf \ > @@ -152,7 +151,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libvirglrenderer-dev:armhf \ > libvte-2.91-dev:armhf \ > libxdp-dev:armhf \ > - libxen-dev:armhf \ > libzstd-dev:armhf \ > nettle-dev:armhf \ > systemtap-sdt-dev:armhf \ This fails to build: Build started at 2025-09-26T16:02:34.986501 Main binary: /tmp/qemu-test/build/pyvenv/bin/python3 Build Options: -Dwerror=true -Dprefix=/tmp/qemu-test/install -Drust=enabled -Ddocs=enabled -Dplugins=true --cross-file=config-meson.cross --native-file=config-meson.native Python system: Linux The Meson build system Version: 1.9.0 Source dir: /tmp/qemu-test/src Build dir: /tmp/qemu-test/build Build type: cross build Project name: qemu Project version: 10.1.50 ----------- Detecting compiler via: `arm-linux-gnueabihf-gcc --version` -> 0 stdout: arm-linux-gnueabihf-gcc (Debian 14.2.0-19) 14.2.0 Copyright (C) 2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ----------- Running command: -cpp -x c -E -dM - ----- ----------- Detecting linker via: `arm-linux-gnueabihf-gcc -Wl,--version` -> 0 stdout: GNU ld (GNU Binutils for Debian) 2.44 Copyright (C) 2025 Free Software Foundation, Inc. This program is free software; you may redistribute it under the terms of the GNU General Public License version 3 or (at your option) a later version. This program has absolutely no warranty. ----------- stderr: collect2 version 14.2.0 /usr/lib/gcc-cross/arm-linux-gnueabihf/14/../../../../arm-linux-gnueabihf/bin/ld -plugin /usr/libexec/gcc-cross/arm-linux-gnueabihf/14/liblto_plugin.so -plugin-opt=/usr/libexec/gcc-cross/arm-linux-gnueabihf/14/lto-wrapper -plugin-opt=-fresolution=/tmp/ccSBX4gO.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --sysroot=/ --build-id --eh-frame-hdr -dynamic-linker /lib/ld-linux-armhf.so.3 -X --hash-style=gnu --as-needed -m armelf_linux_eabi -pie /lib/arm-linux-gnueabihf/Scrt1.o /lib/arm-linux-gnueabihf/crti.o /usr/lib/gcc-cross/arm-linux-gnueabihf/14/crtbeginS.o -L/usr/lib/gcc-cross/arm-linux-gnueabihf/14 -L/usr/lib/gcc-cross/arm-linux-gnueabihf/14/../../../../arm-linux-gnueabihf/lib -L/lib/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf --version -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc-cross/arm-linux-gnueabihf/14/crtendS.o /lib/arm-linux-gnueabihf/crtn.o ----------- Sanity testing C compiler: arm-linux-gnueabihf-gcc Is cross compiler: True. Sanity check compiler command line: arm-linux-gnueabihf-gcc sanitycheckc.c -o sanitycheckc_cross.exe -D_FILE_OFFSET_BITS=64 -c Sanity check compile stdout: ----- Sanity check compile stderr: ----- C compiler for the host machine: arm-linux-gnueabihf-gcc (gcc 14.2.0 "arm-linux-gnueabihf-gcc (Debian 14.2.0-19) 14.2.0") C linker for the host machine: arm-linux-gnueabihf-gcc ld.bfd 2.44 ----------- Detecting archiver via: `arm-linux-gnueabihf-ar --version` -> 0 stdout: GNU ar (GNU Binutils for Debian) 2.44 Copyright (C) 2025 Free Software Foundation, Inc. This program is free software; you may redistribute it under the terms of the GNU General Public License version 3 or (at your option) any later version. This program has absolutely no warranty. ----------- ----------- Detecting compiler via: `cc --version` -> 0 stdout: cc (Debian 14.2.0-19) 14.2.0 Copyright (C) 2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ----------- Running command: -cpp -x c -E -dM - ----- ----------- Detecting linker via: `cc -Wl,--version` -> 0 stdout: GNU ld (GNU Binutils for Debian) 2.44 Copyright (C) 2025 Free Software Foundation, Inc. This program is free software; you may redistribute it under the terms of the GNU General Public License version 3 or (at your option) a later version. This program has absolutely no warranty. ----------- stderr: collect2 version 14.2.0 /usr/bin/ld -plugin /usr/libexec/gcc/x86_64-linux-gnu/14/liblto_plugin.so -plugin-opt=/usr/libexec/gcc/x86_64-linux-gnu/14/lto-wrapper -plugin-opt=-fresolution=/tmp/ccm2bSZj.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie /usr/lib/gcc/x86_64-linux-gnu/14/../../../x86_64-linux-gnu/Scrt1.o /usr/lib/gcc/x86_64-linux-gnu/14/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/14/crtbeginS.o -L/usr/lib/gcc/x86_64-linux-gnu/14 -L/usr/lib/gcc/x86_64-linux-gnu/14/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/14/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/14/../../.. --version -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-linux-gnu/14/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/14/../../../x86_64-linux-gnu/crtn.o ----------- Sanity testing C compiler: cc Is cross compiler: False. Sanity check compiler command line: cc sanitycheckc.c -o sanitycheckc.exe -D_FILE_OFFSET_BITS=64 Sanity check compile stdout: ----- Sanity check compile stderr: ----- Running test binary command: /tmp/qemu-test/build/meson-private/sanitycheckc.exe ----------- Sanity check: `/tmp/qemu-test/build/meson-private/sanitycheckc.exe` -> 0 C compiler for the build machine: cc (gcc 14.2.0 "cc (Debian 14.2.0-19) 14.2.0") C linker for the build machine: cc ld.bfd 2.44 ----------- Detecting archiver via: `gcc-ar --version` -> 0 stdout: GNU ar (GNU Binutils for Debian) 2.44 Copyright (C) 2025 Free Software Foundation, Inc. This program is free software; you may redistribute it under the terms of the GNU General Public License version 3 or (at your option) any later version. This program has absolutely no warranty. ----------- Build machine cpu family: x86_64 Build machine cpu: x86_64 Host machine cpu family: arm Host machine cpu: arm Target machine cpu family: arm Target machine cpu: arm Program scripts/symlink-install-tree.py found: YES (/tmp/qemu-test/build/pyvenv/bin/python3 /tmp/qemu-test/src/scripts/symlink-install-tree.py) Program sh found: YES (/usr/bin/sh) Program python3 found: YES (/tmp/qemu-test/build/pyvenv/bin/python3) ----------- Detecting compiler via: `arm-linux-gnueabihf-gcc --version` -> 0 stdout: arm-linux-gnueabihf-gcc (Debian 14.2.0-19) 14.2.0 Copyright (C) 2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ----------- Running command: -cpp -x c -E -dM - ----- ----------- Detecting linker via: `arm-linux-gnueabihf-gcc -Wl,--version` -> 0 stdout: GNU ld (GNU Binutils for Debian) 2.44 Copyright (C) 2025 Free Software Foundation, Inc. This program is free software; you may redistribute it under the terms of the GNU General Public License version 3 or (at your option) a later version. This program has absolutely no warranty. ----------- stderr: collect2 version 14.2.0 /usr/lib/gcc-cross/arm-linux-gnueabihf/14/../../../../arm-linux-gnueabihf/bin/ld -plugin /usr/libexec/gcc-cross/arm-linux-gnueabihf/14/liblto_plugin.so -plugin-opt=/usr/libexec/gcc-cross/arm-linux-gnueabihf/14/lto-wrapper -plugin-opt=-fresolution=/tmp/ccDS7TeO.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --sysroot=/ --build-id --eh-frame-hdr -dynamic-linker /lib/ld-linux-armhf.so.3 -X --hash-style=gnu --as-needed -m armelf_linux_eabi -pie /lib/arm-linux-gnueabihf/Scrt1.o /lib/arm-linux-gnueabihf/crti.o /usr/lib/gcc-cross/arm-linux-gnueabihf/14/crtbeginS.o -L/usr/lib/gcc-cross/arm-linux-gnueabihf/14 -L/usr/lib/gcc-cross/arm-linux-gnueabihf/14/../../../../arm-linux-gnueabihf/lib -L/lib/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf --version -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc-cross/arm-linux-gnueabihf/14/crtendS.o /lib/arm-linux-gnueabihf/crtn.o ----------- ----------- Detecting compiler via: `rustc --target arm-unknown-linux-gnueabi --version` -> 0 stdout: rustc 1.85.0 (4d91de4e4 2025-02-17) (built from a source tarball) ----------- ----------- Called: `rustc --target arm-unknown-linux-gnueabi -C linker=arm-linux-gnueabihf-gcc -o /tmp/qemu-test/build/meson-private/rusttest.exe /tmp/qemu-test/build/meson-private/sanity.rs` -> 1 stderr: error[E0463]: can't find crate for `std` | = note: the `arm-unknown-linux-gnueabi` target may not be installed = help: consider downloading the target with `rustup target add arm-unknown-linux-gnueabi` error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0463`. ----------- ../src/meson.build:91:12: ERROR: Rust compiler rustc --target arm-unknown-linux-gnueabi -C linker=arm-linux-gnueabihf-gcc cannot compile programs. Failed to run 'configure' make[1]: *** [tests/docker/Makefile.include:203: docker-run] Error 1 make[1]: Leaving directory '/home/alex/lsrc/qemu.git' make: *** [tests/docker/Makefile.include:131: docker-test-build@debian-armhf-cross] Error 2 🕙17:02:35 alex@draig:qemu.git on testing/next:master [$!?⇡] took 12m1s [🔴 USAGE] > diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker > index e7e8d8e0f1..f53b77cb62 100644 > --- a/tests/docker/dockerfiles/debian-i686-cross.docker > +++ b/tests/docker/dockerfiles/debian-i686-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch i686 debian-12 qemu > +# $ lcitool dockerfile --layers all --cross-arch i686 debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > @@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > eatmydata apt-get install --no-install-recommends -y \ > gcc-i686-linux-gnu \ > libaio-dev:i386 \ > - libasan6:i386 \ > + libasan8:i386 \ > libasound2-dev:i386 \ > libattr1-dev:i386 \ > libbpf-dev:i386 \ > @@ -107,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libgbm-dev:i386 \ > libgcrypt20-dev:i386 \ > libglib2.0-dev:i386 \ > - libglusterfs-dev:i386 \ > libgnutls28-dev:i386 \ > libgtk-3-dev:i386 \ > libgtk-vnc-2.0-dev:i386 \ > @@ -127,7 +127,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libpixman-1-dev:i386 \ > libpng-dev:i386 \ > libpulse-dev:i386 \ > - librbd-dev:i386 \ > librdmacm-dev:i386 \ > libsasl2-dev:i386 \ > libsdl2-dev:i386 \ > diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker > index 97ef64d934..09de265c26 100644 > --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker > +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-12 qemu > +# $ lcitool dockerfile --layers all --cross-arch ppc64le debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > @@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > eatmydata apt-get install --no-install-recommends -y \ > gcc-powerpc64le-linux-gnu \ > libaio-dev:ppc64el \ > - libasan6:ppc64el \ > + libasan8:ppc64el \ > libasound2-dev:ppc64el \ > libattr1-dev:ppc64el \ > libbpf-dev:ppc64el \ > diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker > index 3afe91494d..d7b2ca99ce 100644 > --- a/tests/docker/dockerfiles/debian-s390x-cross.docker > +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch s390x debian-12 qemu > +# $ lcitool dockerfile --layers all --cross-arch s390x debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -48,11 +48,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > @@ -85,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > eatmydata apt-get install --no-install-recommends -y \ > gcc-s390x-linux-gnu \ > libaio-dev:s390x \ > - libasan6:s390x \ > + libasan8:s390x \ > libasound2-dev:s390x \ > libattr1-dev:s390x \ > libbpf-dev:s390x \ > diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker > index f68fcc83a9..2696cf2167 100644 > --- a/tests/docker/dockerfiles/debian.docker > +++ b/tests/docker/dockerfiles/debian.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all debian-12 qemu > +# $ lcitool dockerfile --layers all debian-13 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM docker.io/library/debian:12-slim > +FROM docker.io/library/debian:13-slim > > RUN export DEBIAN_FRONTEND=noninteractive && \ > apt-get update && \ > @@ -32,7 +32,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > git \ > hostname \ > libaio-dev \ > - libasan6 \ > + libasan8 \ > libasound2-dev \ > libattr1-dev \ > libbpf-dev \ > @@ -121,11 +121,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > + python3-tomli \ > python3-venv \ > python3-wheel \ > python3-yaml \ > rpm2cpio \ > - rustc-web \ > + rustc \ > sed \ > socat \ > sparse \ > diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh > index 6f98a91277..f4d2721178 100755 > --- a/tests/lcitool/refresh > +++ b/tests/lcitool/refresh > @@ -105,7 +105,7 @@ alpine_extras = [ > # Netmap still needs to be manually built as it is yet to be packaged > # into a distro. We also add cscope and gtags which are used in the CI > # test > -debian12_extras = [ > +debian13_extras = [ > "# netmap/cscope/global\n", > "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n", > " apt install -y --no-install-recommends \\\n", > @@ -175,8 +175,8 @@ try: > generate_dockerfile("alpine", "alpine-321", > trailer="".join(alpine_extras)) > generate_dockerfile("centos9", "centos-stream-9") > - generate_dockerfile("debian", "debian-12", > - trailer="".join(debian12_extras)) > + generate_dockerfile("debian", "debian-13", > + trailer="".join(debian13_extras)) > generate_dockerfile("fedora", "fedora-41") > generate_dockerfile("opensuse-leap", "opensuse-leap-15") > generate_dockerfile("ubuntu2204", "ubuntu-2204", > @@ -191,30 +191,32 @@ try: > # > # Cross compiling builds > # > - generate_dockerfile("debian-amd64-cross", "debian-12", > + generate_dockerfile("debian-amd64-cross", "debian-13", > cross="x86_64", > trailer=cross_build("x86_64-linux-gnu-", > "x86_64-softmmu," > "x86_64-linux-user," > "i386-softmmu,i386-linux-user")) > > - generate_dockerfile("debian-arm64-cross", "debian-12", > + generate_dockerfile("debian-arm64-cross", "debian-13", > cross="aarch64", > trailer=cross_build("aarch64-linux-gnu-", > "aarch64-softmmu,aarch64-linux-user")) > > - generate_dockerfile("debian-armhf-cross", "debian-12", > + generate_dockerfile("debian-armhf-cross", "debian-13", > cross="armv7l", > trailer=cross_build("arm-linux-gnueabihf-", > "arm-softmmu,arm-linux-user")) > > - generate_dockerfile("debian-i686-cross", "debian-12", > + generate_dockerfile("debian-i686-cross", "debian-13", > cross="i686", > trailer=cross_build("i686-linux-gnu-", > "x86_64-softmmu," > "x86_64-linux-user," > "i386-softmmu,i386-linux-user")) > > + # mips no longer supported in debian-13 > + # https://www.debian.org/releases/trixie/release-notes/issues.html#mips-architectures-removed > generate_dockerfile("debian-mips64el-cross", "debian-12", > cross="mips64el", > trailer=cross_build("mips64el-linux-gnuabi64-", > @@ -225,7 +227,7 @@ try: > trailer=cross_build("mipsel-linux-gnu-", > "mipsel-softmmu,mipsel-linux-user")) > > - generate_dockerfile("debian-ppc64el-cross", "debian-12", > + generate_dockerfile("debian-ppc64el-cross", "debian-13", > cross="ppc64le", > trailer=cross_build("powerpc64le-linux-gnu-", > "ppc64-softmmu,ppc64-linux-user")) > @@ -238,7 +240,7 @@ try: > trailer=cross_build("riscv64-linux-gnu-", > "riscv64-softmmu,riscv64-linux-user")) > > - generate_dockerfile("debian-s390x-cross", "debian-12", > + generate_dockerfile("debian-s390x-cross", "debian-13", > cross="s390x", > trailer=cross_build("s390x-linux-gnu-", > "s390x-softmmu,s390x-linux-user")) -- Alex Bennée Virtualisation Tech Lead @ Linaro
On 24/9/25 14:04, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > --- > .../dockerfiles/debian-amd64-cross.docker | 9 +++++---- > .../dockerfiles/debian-arm64-cross.docker | 9 +++++---- > .../dockerfiles/debian-armhf-cross.docker | 12 +++++------ > .../dockerfiles/debian-i686-cross.docker | 11 +++++----- > .../dockerfiles/debian-ppc64el-cross.docker | 9 +++++---- > .../dockerfiles/debian-s390x-cross.docker | 9 +++++---- > tests/docker/dockerfiles/debian.docker | 9 +++++---- > tests/lcitool/refresh | 20 ++++++++++--------- > 8 files changed, 46 insertions(+), 42 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
© 2016 - 2025 Red Hat, Inc.