From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v2 2/3] tests: upgrade debian-legacy-test-cross to debian 13
Date: Wed, 25 Feb 2026 14:38:55 -0500 [thread overview]
Message-ID: <20260225193856.959771-3-jsnow@redhat.com> (raw)
In-Reply-To: <20260225193856.959771-1-jsnow@redhat.com>
We no longer require Debian 11 to run these tests; they work properly
under Debian 13/Trixie.
Signed-off-by: John Snow <jsnow@redhat.com>
---
.../dockerfiles/debian-legacy-test-cross.docker | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
index 5a6616b7d39..293f31a07d6 100644
--- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
@@ -1,18 +1,13 @@
# Docker legacy cross-compiler target (tests and minimal qemu)
#
-# Compilers for some of our older targets which we cant currently
-# upgrade. Currently:
-#
-# libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412
-# sh4-linux-user: binaries don't run with bookworm compiler
-#
# As we are targeting check-tcg here we only need minimal qemu
# dependencies and the relevant cross compilers.
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:13-slim
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
+# Add deb-src repository sources
+RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
+ /etc/apt/sources.list.d/debian.sources
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -35,12 +30,11 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
libc6-dev-sh4-cross \
python3-pip \
python3-setuptools \
+ python3-tomli \
python3-venv \
python3-wheel && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
-RUN /usr/bin/pip3 install tomli
-
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user
ENV MAKE /usr/bin/make
--
2.53.0
next prev parent reply other threads:[~2026-02-25 19:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-25 19:38 [PATCH v2 0/3] tests: upgrade containers to debian 13 John Snow
2026-02-25 19:38 ` [PATCH v2 1/3] tests: upgrade most non-lcitool debian tests " John Snow
2026-02-26 14:47 ` Daniel P. Berrangé
2026-02-26 17:00 ` Alex Bennée
2026-02-25 19:38 ` John Snow [this message]
2026-02-25 22:57 ` [PATCH v2 2/3] tests: upgrade debian-legacy-test-cross " Alex Bennée
2026-02-26 16:23 ` John Snow
2026-02-26 14:47 ` Daniel P. Berrangé
2026-02-25 19:38 ` [PATCH v2 3/3] python: upgrade minimum setuptools/wheel/pip versions John Snow
2026-02-26 7:59 ` Thomas Huth
2026-02-26 14:45 ` Daniel P. Berrangé
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=20260225193856.959771-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=crosa@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.