From nobody Mon Mar 2 10:55: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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772132052; cv=none; d=zohomail.com; s=zohoarc; b=dAvFICrnJrrMHTtmTbVq8eSpjLaGQd1z+I1KiG0RFxFAbYmKqVnSdamZrv55nXM2tnaB/s7NnvtSdeM4K0ppqc7djjVqVw5XHgFla9j58UPkJhrKl6gCd0vHTbXOnA4+Eu8kBvLgSpeuQZqVxGMUZjYEtWvWpqeFAwyAlnAi++E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132052; 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=MSs0etEZmmvImF5qEa73W/Q5BBnsscmwqVF4ojVJyjY=; b=c6TYwJ9OuUX8gZHs4own8jvs5R2EsWUugkiP1babx0E4KsLNaimGGU+ZZRnsFTmEX4rb1obISHzx6KiI7y9nKRMld2EgniilbORi6RB32AIG3fXjiUXOykWjfbfn24C3s6ukfSUukl3+cc/8FnvV7Voucs90+ZXgql9Zc7KLkOM= 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 1772132052522549.418727982688; Thu, 26 Feb 2026 10:54:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgU5-0008Cd-7s; Thu, 26 Feb 2026 13:53:14 -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 1vvgU1-0008BQ-Mw for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:09 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgTz-0003WT-FG for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:09 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b936505e7a0so104800766b.1 for ; Thu, 26 Feb 2026 10:53:07 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935aede363sm79463466b.60.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 9AE8C5F8BC; 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=1772131986; x=1772736786; 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=MSs0etEZmmvImF5qEa73W/Q5BBnsscmwqVF4ojVJyjY=; b=kMhQd0JSRsIpanAUugDWzLgG6KubzSD0SxWMwWleub7okqxb6lBDOSOrJMFm6SYPfA OkVN0UbrGWT6sX3v/21kxSxuEEVwbNTI3VSXeNxvdNVpClAA8Anrho3msyC/t1n/2Inm ZkbXaRqR7LLeGXQAFluMiqAE51zWsk33PWBKuUCeJT3AGRkc8RvpItRb2kuwkXN+Xjze mSq/hI9wMqnxj+PFjwDZpCnvSOBN6XL/Y3jL3iAmRmp5mhSM5Ue3LDUh+l2+jOWE4eKn oA+PPX/Ne//QNOblCR4VlIniHEVIk4m1aEsUjAMqpf3DM4mLqQ8PtMEKb3MbU+3HOP+W uVzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131986; x=1772736786; 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=MSs0etEZmmvImF5qEa73W/Q5BBnsscmwqVF4ojVJyjY=; b=qr5zZSbxet/+ZZestus3jCEXLCG+Ocyfy/DpzfDCdyUXZiWt8NJTB0g9I1bTpu20zj xsBYNkcGHRqgO50uynldaoAjBU31G5FES9BVVlHojX/5QB/wh35s4KAhyw59fAZ/iRz3 1Ha2hY/2VkPIWeHxBcW9jQ9llADFP9yfSQuMZzvsdXmPVgu7H+YLh+6EiifRALavzc02 4lFZIPcwOlzqsw2Su4zrh8BPYKeYnMDIpJcN1hffCeRwvloz/kpSHVncoC+LPLKcoiog UqRhdHDNV4H8MCDHQ3c3ImLKtuaft0PpVNqx2ZwnD+0piNrQ1qlmb8QvPdGb0CsevR+z /jUw== X-Gm-Message-State: AOJu0YyKaZNKic+3ngy/LIySbLaSghcc1xWEyz990tchMldQ5t5WkaTq PNK3RrpG5avh4NFEZDr1KeZp3MeLUE22fpXJNRdfg7+jrDupdfVUaW+370P3KJ422RI= X-Gm-Gg: ATEYQzwn7vFpaN069LIOtm8vZT3TPYbC87TR90kXorEHa8FJJ4H/MUjOw8HLyomgUc7 CgxqfoCm0bhLklwie0lHXdZ6Dtnt1XBMwOz9Xs6w/shPtRRidEbiG6Cy1M3TPxnQ3RfRO5fDBeO kwTD5RjuOI3wp711hOdvYB6kBzfPn4Tixu6w+kQnGosM7M8F/lfivcwZCOIVdsLE+1zDDdpyOSR m7q7k/Xed5jGnhL9pA8PcjTEUd/hNg5F0bSRvzAPTJqXt1wXCVSSMvAzcz2+8aBMwvqSu/pNJib hVMWlUx5dTQbM41S9UUZNvFYpz4aEkjf5HTHtcaAFuPt8OGpfEs3/pL3DfglpuscWrMaTtEmb+Q jmczbJzA7/9LA5y6BX3iCDE8Fr60OOV+0MUNMOAlmE9tmPk1cT+BGXhZF9GyKvIEK3zZfIn0qvP oA6at0KbO2006YsGDlp2vBZug= X-Received: by 2002:a17:907:7205:b0:b93:6360:9071 with SMTP id a640c23a62f3a-b937580caaemr6506566b.2.1772131985716; 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 Subject: [PATCH v2 2/7] tests/docker: migrate legacy-test-cross compilers to trixie Date: Thu, 26 Feb 2026 18:52:57 +0000 Message-ID: <20260226185303.1920021-3-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::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.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=ham 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: 1772132054250158500 The bugs have evidently been fixed in the latest release so we can migrate the laggards into how all-test-cross container and remove the legacy hacks. They are also packaged for the main architectures so we don't need to jump through the amd64 hoops. Suggested-by: John Snow Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- configure | 10 +--- .gitlab-ci.d/buildtest.yml | 12 ----- .gitlab-ci.d/container-cross.yml | 6 --- .gitlab-ci.d/containers.yml | 1 - .../dockerfiles/debian-all-test-cross.docker | 8 ++- .../debian-legacy-test-cross.docker | 51 ------------------- tests/lcitool/refresh | 8 ++- 7 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-legacy-test-cross.docker diff --git a/configure b/configure index c4837eba2b1..683813473e9 100755 --- a/configure +++ b/configure @@ -1450,7 +1450,7 @@ probe_target_compiler() { container_image=3Ddebian-all-test-cross container_cross_prefix=3Daarch64-linux-gnu- ;; - hppa|m68k|mips|riscv64|sparc64) + alpha|hppa|m68k|mips|riscv64|sh4|sparc64) container_image=3Ddebian-all-test-cross ;; mips64) @@ -1462,14 +1462,6 @@ probe_target_compiler() { container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- ;; =20 - # debian-legacy-test-cross architectures (need Debian 11) - # - libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugrepo= rt.cgi?bug=3D1054412 - # - sh4-linux-user: binaries don't run with bookworm compiler - - alpha|sh4) - container_image=3Ddebian-legacy-test-cross - ;; - # architectures with individual containers =20 aarch64) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 1b656b9eb08..fef19c2d5da 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -376,18 +376,6 @@ build-user-static: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --static - --target-list-exclude=3Dalpha-linux-user,sh4-linux-user - MAKE_CHECK_ARGS: check-tcg - -# targets stuck on older compilers -build-legacy: - extends: .native_build_job_template - needs: - - job: amd64-debian-legacy-cross-container - variables: - IMAGE: debian-legacy-test-cross - TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user - CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg =20 build-user-hexagon: diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 2a0cea6ce1a..92a7f1c1b47 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -10,12 +10,6 @@ amd64-debian-user-cross-container: variables: NAME: debian-all-test-cross =20 -amd64-debian-legacy-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-legacy-test-cross - arm64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 6aeccf8be0c..c8b8e44ad86 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -45,7 +45,6 @@ weekly-container-builds: # cross - amd64-debian-cross-container - amd64-debian-user-cross-container - - amd64-debian-legacy-cross-container - arm64-debian-cross-container - hexagon-cross-container - loongarch-debian-cross-container diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index 1823233438a..b73776d95b5 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -64,6 +64,8 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ gcc-mips-linux-gnu \ libc6-dev-mips-cross \ gcc-mips64-linux-gnuabi64 \ @@ -77,7 +79,9 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross \ gcc-s390x-linux-gnu \ - libc6-dev-s390x-cross + libc6-dev-s390x-cross\ + gcc-sh4-linux-gnu \ + libc6-dev-sh4-cross RUN if dpkg-architecture -e amd64; then \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu = libc6-dev-hppa-cross"; \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu = libc6-dev-m68k-cross"; \ @@ -90,7 +94,7 @@ apt install -y --no-install-recommends \ ${AVAILABLE_COMPILERS} && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /= packages.txt ENV QEMU_CONFIGURE_OPTS --disable-docs -ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386= -linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linu= x-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user= ,riscv64-linux-user,s390x-linux-user,sparc64-linux-user +ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hpp= a-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-u= ser,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,p= pc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc6= 4-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tes= ts/docker/dockerfiles/debian-legacy-test-cross.docker deleted file mode 100644 index 5a6616b7d39..00000000000 --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker +++ /dev/null @@ -1,51 +0,0 @@ -# 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. - -FROM docker.io/library/debian:11-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - apt build-dep -yy qemu - -# Add extra build tools and as many cross compilers as we can for testing -RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ - ccache \ - clang \ - flex \ - git \ - ninja-build \ - gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross \ - python3-pip \ - python3-setuptools \ - 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 -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 8f0aa3fa343..c74345e03d0 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -172,6 +172,8 @@ debian_all_test_cross_compilers =3D [ " libc6-dev-arm64-cross \\\n", " gcc-arm-linux-gnueabihf \\\n", " libc6-dev-armhf-cross \\\n", + " gcc-alpha-linux-gnu \\\n" + " libc6.1-dev-alpha-cross \\\n" " gcc-mips-linux-gnu \\\n", " libc6-dev-mips-cross \\\n", " gcc-mips64-linux-gnuabi64 \\\n", @@ -185,7 +187,9 @@ debian_all_test_cross_compilers =3D [ " gcc-riscv64-linux-gnu \\\n", " libc6-dev-riscv64-cross \\\n", " gcc-s390x-linux-gnu \\\n", - " libc6-dev-s390x-cross\n", + " libc6-dev-s390x-cross\\\n", + " gcc-sh4-linux-gnu \\\n", + " libc6-dev-sh4-cross\n", "RUN if dpkg-architecture -e amd64; then \\\n", " export AVAILABLE_COMPILERS=3D\"${AVAILABLE_COMPILERS} gcc-hppa-linu= x-gnu libc6-dev-hppa-cross\"; \\\n", " export AVAILABLE_COMPILERS=3D\"${AVAILABLE_COMPILERS} gcc-m68k-linu= x-gnu libc6-dev-m68k-cross\"; \\\n", @@ -198,7 +202,7 @@ debian_all_test_cross_compilers =3D [ "${AVAILABLE_COMPILERS} && \\\n", "dpkg-query --showformat '${Package}_${Version}_${Architecture}' --sho= w > /packages.txt\n", "ENV QEMU_CONFIGURE_OPTS --disable-docs\n", - "ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user= ,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el= -linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux= -user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user\n", + "ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-use= r,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-li= nux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-u= ser,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,s= parc64-linux-user\n", ] =20 def cross_build(prefix, targets): --=20 2.47.3