From nobody Thu Apr 16 20:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772048393; cv=none; d=zohomail.com; s=zohoarc; b=laqJLOESqhN62Ie4UjSBTeyjeKvCIq1nqvvug/5jVBUrD4/ZLwN4Gt+xGh3YUTAUrj0Fy0VuL5jUmYlYl+DxtQ0HeL6Ngb//KDl/KRStFYAbPaZgp4Qm8qU5tUdd5gKk48egEJfsBXbY9hi8/E5+cceH75sqoIrP8HC2cSnEHPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772048393; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UGamRHCZZotPYdD4QJkEqFev+eWk6hGT7n5u76/zW5Y=; b=gizOTBjjx9ypgWY0ju5fAtayU4NbewL/3nOUFeCnAHt9cTxm7ryOz28OhKextQrEDLwD4OsP3Ltsx1L/XWLG/1hY09JAJLbqEY49q6iEgJ8bRH2DY2yT5UGQfiRIFRsGK4Siw3C79BRtUaGmuKgNL8IOC3QxRlYGUdepkbQikEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772048393482884.2676738015552; Wed, 25 Feb 2026 11:39:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvKj8-0007qT-88; Wed, 25 Feb 2026 14:39:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvKj6-0007q6-GQ for qemu-devel@nongnu.org; Wed, 25 Feb 2026 14:39:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvKj4-0001tG-Ca for qemu-devel@nongnu.org; Wed, 25 Feb 2026 14:39:16 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-351-3Wg8NNouPIyVEh1mIqGuXA-1; Wed, 25 Feb 2026 14:39:04 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0BE051956055; Wed, 25 Feb 2026 19:39:03 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.89.212]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0D9A11800370; Wed, 25 Feb 2026 19:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772048353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UGamRHCZZotPYdD4QJkEqFev+eWk6hGT7n5u76/zW5Y=; b=g3ywd/Dr9+7U5CU6wPIExHdFEWeMnRetXv48izr4dprZ/enuvm57tPPXPTfGkNBLw3nWwK sW5/FDWXKZ6sNV/hqAZUFQ58FB+tEtr7k8djTv+zbmyRbBXbgtNgtehXzhJQbtx49M2bR8 xjPfbuQRm4P19uNhSkzNBa7ao0j6HwQ= X-MC-Unique: 3Wg8NNouPIyVEh1mIqGuXA-1 X-Mimecast-MFC-AGG-ID: 3Wg8NNouPIyVEh1mIqGuXA_1772048343 From: John Snow To: qemu-devel@nongnu.org Cc: Thomas Huth , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 1/3] tests: upgrade most non-lcitool debian tests to debian 13 Date: Wed, 25 Feb 2026 14:38:54 -0500 Message-ID: <20260225193856.959771-2-jsnow@redhat.com> In-Reply-To: <20260225193856.959771-1-jsnow@redhat.com> References: <20260225193856.959771-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.734, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.78, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772048396137158500 Content-Type: text/plain; charset="utf-8" Debian 11 was EOL in 2024, and Debian 12 will be EOL this June. This patch moves all but one of our tests, debian-legacy-test-cross, onto Debian 13. This patch does the bare minimum to upgrade these tests and doesn't make any attempt at optimization or cleanup that may or may not be possible with this upgrade. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/docker/dockerfiles/debian-hexagon-cross.docker | 11 ++++++----- .../docker/dockerfiles/debian-loongarch-cross.docker | 10 +++++----- tests/docker/dockerfiles/debian-toolchain.docker | 8 +++++--- tests/docker/dockerfiles/debian-tricore-cross.docker | 5 ++--- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/d= ocker/dockerfiles/debian-hexagon-cross.docker index 23152b4918b..91d4b71ac95 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -5,10 +5,12 @@ # needs to be able to build QEMU itself in CI we include its # build-deps. # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim + +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ @@ -24,6 +26,7 @@ RUN apt-get update && \ ninja-build \ python3-pip \ python3-setuptools \ + python3-tomli \ python3-venv \ python3-wheel && \ # Install QEMU build deps for use in CI @@ -36,8 +39,6 @@ RUN apt-get update && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt =20 -RUN /usr/bin/pip3 install tomli - ENV TOOLCHAIN_INSTALL /opt ENV TOOLCHAIN_RELEASE 12.Dec.2023 ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unkn= own-linux-musl" diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests= /docker/dockerfiles/debian-loongarch-cross.docker index 538ab534902..55b3dbe4510 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -4,10 +4,11 @@ # This docker target uses prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -31,12 +32,11 @@ RUN apt-get update && \ ninja-build \ python3-pip \ python3-setuptools \ + python3-tomli \ python3-venv \ python3-wheel && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' = --show > /packages.txt =20 -RUN /usr/bin/pip3 install tomli - RUN curl -#SL https://github.com/loongson/build-tools/releases/download/20= 23.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \ | tar -xJC /opt =20 diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docke= r/dockerfiles/debian-toolchain.docker index ab4ce29533d..9a256209a78 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -4,13 +4,15 @@ # This dockerfile is used for building a cross-compiler toolchain. # The script for building the toolchain is supplied via extra-files. # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 # Install build utilities for building gcc and glibc. # ??? The build-dep isn't working, missing a number of # minimal build dependiencies, e.g. libmpc. =20 -RUN sed 's/^deb /deb-src /' /etc/apt/sources.list.= d/deb-src.list +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ @@ -34,7 +36,7 @@ RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, # and the build trees by restoring the original image, # then copying the built toolchain from stage 0. -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index 7e00e870ceb..fd797dc7ee4 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -9,7 +9,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ @@ -31,12 +31,11 @@ RUN apt update && \ pkgconf \ python3-pip \ python3-setuptools \ + python3-tomli \ python3-wheel \ python3-venv && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' -= -show > /packages.txt =20 -RUN /usr/bin/pip3 install tomli - RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download= /tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ | tar -xzC /usr/local/ =20 diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/do= cker/dockerfiles/debian-xtensa-cross.docker index d011eee2ad3..ef63e44e2ef 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -5,7 +5,7 @@ # using a prebuilt toolchains for Xtensa cores from: # https://github.com/foss-xtensa/toolchain/releases # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ --=20 2.53.0 From nobody Thu Apr 16 20:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772048426; cv=none; d=zohomail.com; s=zohoarc; b=k9Zw7gEP0uRJ4oEuG+wGpiZszTa3SxqYif6O5Nm1gvSIPMqf34WRpBMRTZY60jWOhvBPU6NrZhFipVm7UKcrUnUuEhlp4yr2w6MQ0hs9c49pScePRNqSz57cNhv3byLtDHGssvuxS/BM3ssZk48frxOkuJntNi6p9NJViRbgNY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772048426; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9NCJ4mFbAphqTGvPGQENy2t485k2etqwV0Ur0lBLu3Y=; b=S9Ew1DuqHNAewOyA1G8jmrrhacrASSNaqRpjlVuRX5vHp3mFndA33/ROUASiM8AdxT5/ZDbpyFZ09xx0g7E1+JTLKJR6NjYgEuZN52qkIxaTZTbdu3fhEJMHdN9oUV0SHII6jUu1WpRKY5i1g5U2e0sqIjdB8JFpov9BVVVzZM4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772048426328345.860688427559; Wed, 25 Feb 2026 11:40:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvKj3-0007pB-Ia; Wed, 25 Feb 2026 14:39:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvKj0-0007oc-Vm for qemu-devel@nongnu.org; Wed, 25 Feb 2026 14:39:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvKiz-0001sK-EA for qemu-devel@nongnu.org; Wed, 25 Feb 2026 14:39:10 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-310-cWw1CA0iNYywwm1T4nadqw-1; Wed, 25 Feb 2026 14:39:05 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D88C71956053; Wed, 25 Feb 2026 19:39:04 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.89.212]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 41DD71800370; Wed, 25 Feb 2026 19:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772048348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9NCJ4mFbAphqTGvPGQENy2t485k2etqwV0Ur0lBLu3Y=; b=bXseSr7WG5xfdTnZPX4DUjDB318pUB3LWjY6kSd9Ayc7pSBs3cWzFCfL7Gajaaw80jn+6J rtzyChDJeaYqHG4aIo2EjqHMkV958wBG2i/3PeeyYOooSEjX95T3oSCFrWUeGuSH1MKF41 SIFNgiLitSUIDci7XoeCgwbZs8xrYw8= X-MC-Unique: cWw1CA0iNYywwm1T4nadqw-1 X-Mimecast-MFC-AGG-ID: cWw1CA0iNYywwm1T4nadqw_1772048345 From: John Snow To: qemu-devel@nongnu.org Cc: Thomas Huth , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 2/3] tests: upgrade debian-legacy-test-cross to debian 13 Date: Wed, 25 Feb 2026 14:38:55 -0500 Message-ID: <20260225193856.959771-3-jsnow@redhat.com> In-Reply-To: <20260225193856.959771-1-jsnow@redhat.com> References: <20260225193856.959771-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.734, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.78, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772048427988158500 Content-Type: text/plain; charset="utf-8" We no longer require Debian 11 to run these tests; they work properly under Debian 13/Trixie. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- .../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/tes= ts/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=3D1054412 -# 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. =20 -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -35,12 +30,11 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive 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 =20 -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 --=20 2.53.0 From nobody Thu Apr 16 20:56:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772048394; cv=none; d=zohomail.com; s=zohoarc; b=PNF11C99+MEa7uoLQyWSMh6u/1uiinDmPlUXEHWHEoQ+BUcdo8f+56Bg/QFX5Slv4CCs61N0KfkOlN8f64u7zr+lFF4WMeHlJA1u4KAFy0Y2HUvr66SIM7Z/OOzCv0KSZ8vuCl/4Q04VjdpDYLc3MuU193PA0DB4fpiqhD/9Jz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772048394; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/0mPiy+0iiFSz1z1ujMFJR4cgSE3YBUuiBiwRtiSapg=; b=GJooA+3TX6vQ8gzlJFnqRZUgSxzm9glSNfKwrUZjVBsEeBqNEyZqMyOgKzJi5be4UiYj/j+azlwPswNE5I7q8T+wrmfC3ouEtSJ4dtasUtYPMGSstXrlwUon0hRO6jgAZ2TlCLMCcnYN0Z/Z/J3yn9NCrs2h4izPVD7lF/bXHPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772048394170145.14003086563662; Wed, 25 Feb 2026 11:39:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvKj5-0007pa-RO; Wed, 25 Feb 2026 14:39:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvKj1-0007od-FY for qemu-devel@nongnu.org; Wed, 25 Feb 2026 14:39:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvKiz-0001sS-SX for qemu-devel@nongnu.org; Wed, 25 Feb 2026 14:39:11 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-304-js_H-syyP0eJZmxyHnd_HQ-1; Wed, 25 Feb 2026 14:39:07 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BD5A9195608A; Wed, 25 Feb 2026 19:39:06 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.89.212]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B5831800671; Wed, 25 Feb 2026 19:39:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772048349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/0mPiy+0iiFSz1z1ujMFJR4cgSE3YBUuiBiwRtiSapg=; b=Pd5bovUu6rqoMI5BUjGTyjOezZaRQp4UubpkmCgmRxT+0OXzG2n9UbR/pURIsCrHiP2+oQ R0cO0pqacak438RkwLuB+cUtKBIFqXP1Okrny2FXII08hGkF+uYoahFCU7klYovZztrQxF KA6W8o2CP+juqwbczNv2iQZ6PaWb1oc= X-MC-Unique: js_H-syyP0eJZmxyHnd_HQ-1 X-Mimecast-MFC-AGG-ID: js_H-syyP0eJZmxyHnd_HQ_1772048346 From: John Snow To: qemu-devel@nongnu.org Cc: Thomas Huth , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 3/3] python: upgrade minimum setuptools/wheel/pip versions Date: Wed, 25 Feb 2026 14:38:56 -0500 Message-ID: <20260225193856.959771-4-jsnow@redhat.com> In-Reply-To: <20260225193856.959771-1-jsnow@redhat.com> References: <20260225193856.959771-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.734, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.78, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772048396073158500 Content-Type: text/plain; charset="utf-8" With Debian 11 tests removed from our CI suite, we are allowed to rely on the versions present in CentOS Stream 9 as a new minimum. Note that CentOS Stream 9 does offer Python 3.12 packages, but mandating this incurs the loss of ability to build offline documentation on CentOS because there is no official Sphinx package for Python 3.12. We will very likely mandate these upgraded packages for QEMU 11.1, but there is no real benefit to doing it now for 11.0 - It will be simpler to perform that upgrade after QEMU drops support for Ubuntu 22.04 LTS in late April. See https://gitlab.com/jsnow/repology-dashboard#results-overview-as-of-2026-02-= 16 for more details on current Python ecosystem versions across all of our supported build platforms. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- python/tests/minreqs.txt | 1 + pythondeps.toml | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index 855b5129c94..6fc671b1780 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -16,6 +16,7 @@ # installation of the QEMU package itself fails, failing to find # setuptools. setuptools<=3D70 +wheel=3D=3D0.36.2 =20 # Dependencies for qapidoc/qapi_domain et al sphinx=3D=3D3.4.3 diff --git a/pythondeps.toml b/pythondeps.toml index a0717742423..c843f163a8f 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -38,14 +38,16 @@ sphinx_rtd_theme =3D { accepted =3D ">=3D0.5", installe= d =3D "1.2.2" } [tooling] "qemu.qmp" =3D { accepted =3D ">=3D0.0.5", installed =3D "0.0.5" } "qemu" =3D { path =3D "python/" } -# NB: The following dependencies should be a little bit more modern than -# the versions listed here, but we are still using Debian 11 for several -# GitLab CI tests, so we are further restricted. -"setuptools" =3D { accepted =3D ">=3D44.1.1" } -"wheel" =3D { accepted =3D ">=3D0.34.2" } -# pip should be guaranteed by mkvenv, this is merely a sanity check for -# which version we are counting on being present. -"pip" =3D { accepted =3D ">=3D20.3.4" } +# These dependencies largely serve as sanity checks and a place to +# record our current accepted minimum versions of various python +# packaging modules; in offline mode, the absence of these modules will +# cause configure to fail. +# +# We are currently constrained by CentOS Stream 9. +"setuptools" =3D { accepted =3D ">=3D53.0.0" } +"wheel" =3D { accepted =3D ">=3D0.36.2" } +# Guaranteed by mkvenv, sanity-check only +"pip" =3D { accepted =3D ">=3D21.3.1" } =20 # This test group is for functional tests, and can include dependencies # fetched from PyPI. --=20 2.53.0