From nobody Mon Mar 2 10:54:08 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772132082; cv=none; d=zohomail.com; s=zohoarc; b=CcHVUM8JVE+WINb6/I/9tPMQgvFxld3uW4OlrDDP7zKy8pfwL0F5Q7ZDcwOMbU5PKJTFH1M6fkE2VB1vyF7GwNnYFt0si0J+nCnVn1ZqmGjOhkzWLhU3VhmdqRajL1hosKueTbn0w3wq9WbVKSqDuTCt433E9wN3cLOIP/T8rAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132082; h=Content-Type: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=QkFfoTUTnHUyPobpDVFMIZRdkqj9H3jZxM/MRJrFhww=; b=DLBpbRbT3UxvCphx3obUoULo2I2qDSH46zG6JNPitEj9sWEDuOmIP2+rlIUp8pjtcQFTk7UZijpBfEc/Kp5JBGaky/QyNNnsapG0NkNT8ydg1tPButfQZyV5N7YCQz1oTuDC0M8AFt4P03cItTGwyyT/Apl19wfWJxBfm76Y4IA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772132082104771.6597072396843; Thu, 26 Feb 2026 10:54:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUW-0008Km-3d; Thu, 26 Feb 2026 13:53:40 -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 1vvgU3-0008C8-BI for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:11 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgTz-0003WP-KZ for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:11 -0500 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-b935cd1c6f3so163767966b.3 for ; Thu, 26 Feb 2026 10:53:06 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935ae60bf5sm86835266b.42.2026.02.26.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:04 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7CE045F8BA; Thu, 26 Feb 2026 18:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131985; x=1772736785; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QkFfoTUTnHUyPobpDVFMIZRdkqj9H3jZxM/MRJrFhww=; b=GIm49HwOXve7E6ifuHuQyJDLGabkS4Avh/GTBf35SXwcbaHVXHE/8/fWSteBSbeYRF XtNY+I8Li2GV5tLt9tuzH0K7l4KFRhUmsOz1/TDTJyL8V+70UnneOulrFMs9mc55V7Tj BMhRXF4hSpVzOurjHdpdu5Ht1OmHDJwW7LLIMjPbJuSuZ8OBn9zGg5DphWCAB+gzzJD6 BTLXd0BUPIn2g8LNQAxFw8n8ZYaUjVM/I5tZ77JJnui0czNF0zyNDz0HcAr0FPJY4pZt pLIROl7Qp51id00kK9Y6kPwOV+hwE2VkmW2imQ8kNDQh9TeSwj6zfmhUUfZMFhJXhBA+ Lm/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131985; x=1772736785; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QkFfoTUTnHUyPobpDVFMIZRdkqj9H3jZxM/MRJrFhww=; b=XuSKhumb2yrjH8VVA9jklGCg17C0GgR3xuQL/67GKGavt+zQTdm58PIXzGRcVyG1DH zBI+iPgf4+y+lgbWnD7uYzLanIgBa6s1ZDqvEAhjnDFdsgkI1/QhJimFNag0lJTtL9KO 7D+AKWQlA7npWKwW7HgHYIw4J4g6aOZlofueM4kfbvhgQ0WuhqgBHhawz2U9pQJ4ybLr 4rLaHiVaYocfjlBp5dhiuL6G5VqsFfoMCNrLVp0uD0I7kjcmY92Dk3e06Zl7YUM7tSch FzpNkmY+pyzPnM2aFjNNGceCpehu/EMwZrnokTUTGrx3ozeXYUVSrInFX+PBkkU4AFcX 007A== X-Gm-Message-State: AOJu0YxVL5cDqKBbjlRE/p7g+mw8so5NbGs9xcKbyBliqPVBEBOyh3Zy SpKNNZe4tJJ1GVfVkFQXK95tdfJcO395eJkW3dMQyuZe2VdZ5dbyUf4ZiF6jmANH4aM= X-Gm-Gg: ATEYQzxo4TyTRRM3ybzDp8GPm28fNJX8g92TbfolMNmYfM8jVcC8v3LKjfKdFqcNMyU utFfIQr1w136Au4eaAJjGQgo1t3rOhJ4kZs44BwT2AESlcCjBA4XnhmkuJzCd4bz/VwjCi92JrY W8dssZq21UOZgMNrSfffug4B+QkkZNl0k3ziXyf27G+JYFtkQ8FF72zsZxJPjMkGj+qSrzUtmfU hMnXH2Kp0Rx9ZLmr7zLW8Pv9EZeO0omgLc6kVFQusPLWWexL+KrrtoxkWPYpW2WrEYoXfL6uUdS zyT9QI8DjvihOZUtW9HOAKCpexFKZ/Toe0SFmZi17tLseSAHGs+ctIv9ZCPPRHDlPNtMRNEink5 Jjc5ZXyhqqYIQnWJXfwAGhNf6fauXWI3c1DNVdb+MTInMAdhsxcm4EhFPUmpogTy9DNV1Y7x6mB Y7XIbovWhbirOVdM7C7G2Fa0Q= X-Received: by 2002:a17:907:84b:b0:b88:6542:86a0 with SMTP id a640c23a62f3a-b93517e2cb1mr324107566b.54.1772131985363; Thu, 26 Feb 2026 10:53:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 1/7] tests/docker: upgrade most non-lcitool debian tests to debian 13 Date: Thu, 26 Feb 2026 18:52:56 +0000 Message-ID: <20260226185303.1920021-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1772132084062158500 From: John Snow 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 [AJB: tweak summary line] Signed-off-by: Alex Benn=C3=A9e --- 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.47.3