From patchwork Sun Oct 29 14:50:21 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: 739059 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp743062wrt; Sun, 29 Oct 2023 07:53:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEsRCH8+z/+EoXD2RLGLYoByBiDT7FoUkwvp5QMgoE4Cu3EMQ7SXoyOSotQjMUsrhdcS5Do X-Received: by 2002:a05:622a:15d0:b0:418:1499:5d65 with SMTP id d16-20020a05622a15d000b0041814995d65mr10068070qty.40.1698591209875; Sun, 29 Oct 2023 07:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591209; cv=none; d=google.com; s=arc-20160816; b=tHYOn1I7LeHSu8RhNIDwC6MhRRStG0N/TKAFo+32CDuJRxsuxXT99G4PLEghi7dzUw G2AK15CsXKhvARa5jcZdroE2Vl2u+UATkI9ITgAOX4BswFBes5mTGjfKNDyfaFzA1wLj aAr1Dc0M7G55xaoWg2IGLW5lN9g8Y8tFDU+/JES2oYaH0tZ0Xec+5etzEhiThOU6yW37 kLMLcbs8TmhN+HEF7cIr8p5iDfKsRAW7rppqz1L82MVtgSPQ2Hucb3Wu+0AhKDJoTEa+ bw9H5hU9/kI3V8/Zob5StBjLtKfWRz1Fe6MpIHynQy+xCoXXcyZkonMNGpO9FeoiiSy3 wM7A== 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=VT+BsD/K1uC8UO+MXugaV+aFFXSnXyb2jJK5zOOiOAg=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=rkTWo4Yk5E+4PpkygCGTeVsWpL1BqACvYwEVjSehe4xFJeLulxT1/B4mJliXRyl3Bf D3UZJiAmmx0zVA5W96yzwdfsGul36eWCn8Oz4cRrw4QFyRLoPi1g5/nTuPr84oin3k4E GHejaNLLRDrTZrRxiJGEKpzhzG/B93JALgCHrwc37Ud5ZYi/7Hwz5mR+R2ISy8Neb2Os q5kQlfNSa4APqiSs+w9160jgMU/2rM1XAG3AyfxTQlI+EKhR8PFRVwd30e3sr2aK2hIl kMWyG2tyFfcExOCIFeqGkfkLbO1+M1oRSVODX+4o8O1V3ybepl7+U+ilxMcN12i8UeHv nrBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y93cRbGG; 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 e21-20020a05622a111500b00418175f3a92si4079549qty.482.2023.10.29.07.53.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:53:29 -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=y93cRbGG; 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 1qx77n-0007VP-R9; Sun, 29 Oct 2023 10:50:47 -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 1qx77l-0007TO-VM for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:45 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx77g-000578-Vj for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:45 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-32d834ec222so2307843f8f.0 for ; Sun, 29 Oct 2023 07:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591039; x=1699195839; 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=VT+BsD/K1uC8UO+MXugaV+aFFXSnXyb2jJK5zOOiOAg=; b=y93cRbGGWJlAhaYU+vr1O/mYEjADUhkwfnWjmR79Z00vMB5lYqfG5IPoaqMGw7GAEa OiIPZp1bVAp+yigEot/qMquvKpqGvtJUAFNNJdNw5JspDXwzqwr46TO2ZhXbVsHYO+Tz SsLIXpwtieQ2dBlg9dVHCxRSr3/urUuoOCOoIo5saknVurKDNtOPjQOvmwaZo5nin82A gNRtFP2pEJIBKoiyqiZzuxkhWIOwU5vFpm734Re+ZZfzCsFd2wIwU1oXWP8Ar3vxMP+Y grj/fTAgvcI3IJLZF1almlqJhBiiPBNLhbtRV22QK1YqgfMO7gltMX/zzhARFctv7Es/ hPtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591039; x=1699195839; 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=VT+BsD/K1uC8UO+MXugaV+aFFXSnXyb2jJK5zOOiOAg=; b=uVrfs6p0zGaEbdvqlCMP5yMR1N1Rct9mkkjP8+UkVjib9WzyypHGdHRgVw28JAYBee PLCueQnyDlQh2p8mNc/77wVlsi/4l0davTUfGB75DQngyeI7sSQlde81uYo/LtTJtsIA TBRTMus9dIc6S/DyQZZ3xBNOTbfKsgQK4IK3JRj69ndGaBcjAPvOJkCJlyfJP4LLVFES wp9ZlH0PoX9EE9iQ5O86FD6kVO3yON7fGK12MdEcc6KsdSdzdCfnHSTNCc4aFGluCfoE Sl6hO9wwUbjJcyb39WV4zylBxskgJYh6MNkyYcegzgjafMTeHcWfQAZAacCKGws51BcS 8o9Q== X-Gm-Message-State: AOJu0Yz0yf26mXjDSB+lnZMtgsoM9sP3aCAJ6YIHmeRg6LwxyeWCmAfg RwhDBQmrGxNbtFpIP8sqDsQmCw== X-Received: by 2002:adf:d1e8:0:b0:32f:7d50:267e with SMTP id g8-20020adfd1e8000000b0032f7d50267emr2958463wrd.9.1698591039565; Sun, 29 Oct 2023 07:50:39 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j13-20020a5d564d000000b00327bf4f2f14sm6103485wrw.88.2023.10.29.07.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:50:36 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B94445F83F; Sun, 29 Oct 2023 14:50:34 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Mahmoud Mandour , Wainer dos Santos Moschetta , Brad Smith , Aleksandar Rikalo , Kyle Evans , Aurelien Jarno , Jiaxun Yang , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Warner Losh , "Edgar E. Iglesias" , Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Brian Cain , Alexandre Iooss Subject: [PATCH v2 07/19] tests/docker: move sh4 to use debian-legacy-test-cross Date: Sun, 29 Oct 2023 14:50:21 +0000 Message-Id: <20231029145033.592566-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029145033.592566-1-alex.bennee@linaro.org> References: <20231029145033.592566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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: <20231028103311.347104-6-alex.bennee@linaro.org> --- v2 - fix missing exclude from build-user - merge fixes --- 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 | 3 ++- .../dockerfiles/debian-sh4-cross.docker | 19 ------------------- 7 files changed, 10 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..d9b37995a2 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. @@ -38,7 +39,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