From patchwork Mon Oct 30 13:57:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 739257 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1132368wrt; Mon, 30 Oct 2023 06:58:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIZ11W2CZfLdeMf3tN23z+rLCYjsL/a5+qzR/8uh170Pc2kFVE04MT08nzBoWDWtFdMb2o X-Received: by 2002:ac8:5e0d:0:b0:41c:c56b:e2bd with SMTP id h13-20020ac85e0d000000b0041cc56be2bdmr12716511qtx.11.1698674323207; Mon, 30 Oct 2023 06:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698674323; cv=none; d=google.com; s=arc-20160816; b=sSdHwME5pUk3Hi7/EGkVj5NRpB0BMA6Ct4gKgxfXJyiRhCt1W+/qu+nsgqLy7E7l+I 64v2VQTFdRttvAO01brVGoUhTw0v0hxJIbCbNwRTENMfI/veh7n3t+U1Bhju/pSLLf2V SFHsyypYieLf4xTb2TTSBP+XClRzzvO2Q+IGzJyUtZVfunVVbMcHOen1mZEibytKNjdV cyyIIe8ifE2+QRsIMbeH/sn5jl/EL7SHljUj8aBL/uVclfFrRyngBMU3EBGMxG9+naWU D/ircKQx2EC6qALQwxACeKYFIsQXSu/en+eoRmRfvYKPNy12EeCWNeaC0p/VgrDw2HQl 2kLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Tk/5qKr9vCMpB2MIkWiFJwpVYmG0BuWF8U0g/K6rZ0M=; fh=B8febGJKmw2arO8EEEC4z2+6/pf1bvwK+a12KfrizqI=; b=RuSgnOR2RYHvci8uMW8Jt7HW+it02ZCme0BEbMxSIhgKd/5ZzNFJa90uEiVTm2Lbzj aLke+CvuCIf6I5ONQsRHQDXzvyIZkMJtN6J5thxUgHl8KSqgVoAMAqLgd2iEsGUf9PTN rSkDyRLET/4+KSygoSzj0wI9Rx/0/fnH4CH1idpnpBkJhQK4IT5Wk5/JZM/dvJFHrPOn GtolhZCw2kY1oz/TRCB7fqzH4Pe+o46aLUQgG/Eh5HN0xLgIb2vVbcg532kCTP1ua/lt MdjpwuFV2xnkzjYXt7sltAk3KzIY7Qqq72aYyl0lJhpUcOzdPpKptkNZ8qVJZ0jN4AcN evkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m8jZkmRh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o3-20020ac85a43000000b00417fe762ebasi5841633qta.501.2023.10.30.06.58.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2023 06:58:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m8jZkmRh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxSlm-0006Qs-1h; Mon, 30 Oct 2023 09:57:30 -0400 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 1qxSlk-0006PB-IV for qemu-devel@nongnu.org; Mon, 30 Oct 2023 09:57:28 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxSli-0001kN-Gu for qemu-devel@nongnu.org; Mon, 30 Oct 2023 09:57:28 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40838915cecso35657045e9.2 for ; Mon, 30 Oct 2023 06:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698674245; x=1699279045; 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=Tk/5qKr9vCMpB2MIkWiFJwpVYmG0BuWF8U0g/K6rZ0M=; b=m8jZkmRhM/B75lMMRGXlSnm3wlA7rX5jT8jr1vAzdOLtJf1hI5F9rOEBz9yMDX//jC tgiDxFUiSuNOgT1SkqHFdcSrXlT3JNdUsR0sRVKSt5onUkWcTwY3s+Il5TA/HC96p05v e4udAGlojxhOGeVLbaL0Ut9o8s5fZGE4/hUXlU0odEn1FXYhlUV3vgr2j6d5z0I+Qa4s uXNXwQag9G9H0dgYjp7n98+ERSLVC51+5rtwzFi3EhBfetsAfi9lTqzvoIcUWXwvwPqD +O5e8RAmIHoLcHb9nsxGiBI1X//ZB0DG/Uepe6vJAaPZMM2IBPmTw5qf9A1gg8upW/8y WnUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698674245; x=1699279045; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tk/5qKr9vCMpB2MIkWiFJwpVYmG0BuWF8U0g/K6rZ0M=; b=kxnyu94L7phijd6glQkeW3zc9gPGhfm6QEu72b0/IN8hBkDDqkvqSpGP8LLBJyxxsJ OHZlw7FGJoQ0IF/ciMbasEiPAJyDVIob5/eDiNkLRY023dwy5eLqvTIVk0xdwLvryaPM aiYThqocrNlw1ewBxE5EbGeUCBiPReNLQraun+AIZ8Or/pCBLY40rt09jZlBp3mj6wd7 2BipjDEW8ezmeSujie604w3V8GTfmmgyNVtL5XVVlEFjrycya7Pm0oFPqdlilBHos4Is PGQ0Fzc3y+cWrm+WpyFCmb4BVWpvlUqiKIz3Bp1KzTXic25DmL+REXgzdWbz8NRe0veU 5yVA== X-Gm-Message-State: AOJu0YxqfhtCs8S59HMCzWzmWMrCTeLCo+YpRrj64kTQ+LYmgzLl3q3n KmYM+ADKL9QJE6FIU1u52SEtGA== X-Received: by 2002:a5d:5186:0:b0:32d:b960:7589 with SMTP id k6-20020a5d5186000000b0032db9607589mr6367238wrv.22.1698674244791; Mon, 30 Oct 2023 06:57:24 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d17-20020adff851000000b0031ad5fb5a0fsm8267790wrq.58.2023.10.30.06.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 06:57:24 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E494D656E5; Mon, 30 Oct 2023 13:57:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PATCH v3] tests/docker: move sh4 to use debian-legacy-test-cross Date: Mon, 30 Oct 2023 13:57:15 +0000 Message-Id: <20231030135715.800164-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <9427da20-92c4-4d98-9073-3f7050d7f7c0@linaro.org> References: <9427da20-92c4-4d98-9073-3f7050d7f7c0@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org sh4 is another target which doesn't work with bookworm compilers. To keep on buster move across to the debian-legacy-test-cross image and update accordingly. Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-8-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- configure | 4 ++++ .gitlab-ci.d/buildtest.yml | 4 ++-- .gitlab-ci.d/container-cross.yml | 6 ------ tests/docker/Makefile.include | 2 +- .../dockerfiles/debian-all-test-cross.docker | 4 +--- .../debian-legacy-test-cross.docker | 5 ++++- .../dockerfiles/debian-sh4-cross.docker | 19 ------------------- 7 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-sh4-cross.docker diff --git a/configure b/configure index c8d0d4f7cb..37d1b10b87 100755 --- a/configure +++ b/configure @@ -1334,6 +1334,10 @@ probe_target_compiler() { container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; + sh4) + container_image=debian-legacy-test-cross + container_cross_prefix=sh4-linux-gnu- + ;; tricore) container_image=debian-tricore-cross container_cross_prefix=tricore- diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 9500ea6e2c..b66d05038f 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -266,7 +266,7 @@ build-user-static: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --static - --target-list-exclude=alpha-linux-user + --target-list-exclude=alpha-linux-user,sh4-linux-user MAKE_CHECK_ARGS: check-tcg # targets stuck on older compilers @@ -276,7 +276,7 @@ build-legacy: job: amd64-debian-legacy-cross-container variables: IMAGE: debian-legacy-test-cross - TARGETS: alpha-linux-user alpha-softmmu + TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0de1929e74..3e6d741f62 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -116,12 +116,6 @@ s390x-debian-cross-container: variables: NAME: debian-s390x-cross -sh4-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-sh4-cross - sparc64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8270bdff6c..f61d97102f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -129,7 +129,7 @@ DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross -DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross +DOCKER_PARTIAL_IMAGES += debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 205173b0a5..43cc083318 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -52,8 +52,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ libc6-dev-riscv64-cross \ gcc-s390x-linux-gnu \ libc6-dev-s390x-cross \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross \ gcc-sparc64-linux-gnu \ libc6-dev-sparc64-cross \ python3-pip \ @@ -64,7 +62,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -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,sh4-linux-user,sparc64-linux-user +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 # 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/tests/docker/dockerfiles/debian-legacy-test-cross.docker index 763d36dfe3..8cc68bc912 100644 --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker +++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker @@ -4,6 +4,7 @@ # 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. @@ -30,6 +31,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ 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 \ @@ -38,7 +41,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST alpha-linux-user +ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker deleted file mode 100644 index 6bd8171d33..0000000000 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ /dev/null @@ -1,19 +0,0 @@ -# -# Docker cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross -# 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