From patchwork Tue Mar 1 09:47:03 2022 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: 547251 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f50:0:0:0:0:0 with SMTP id l16csp3530399imf; Tue, 1 Mar 2022 02:11:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJypNiSyPE55ST7XHRTeZzAeKvTG4oJg1ua36bl7NhqwVApJKxwuJSw4MExmHkaSa+0EPdoL X-Received: by 2002:ad4:41cc:0:b0:432:849c:7ff9 with SMTP id a12-20020ad441cc000000b00432849c7ff9mr16802668qvq.127.1646129459884; Tue, 01 Mar 2022 02:10:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646129459; cv=none; d=google.com; s=arc-20160816; b=n+NzFn7wgBqLzKtIeFY1puqg/tWI2+SCcEe9dEjOOtxsWAqp3pAFCl0Hwcqp12ubel WEaTzi0xXCRGIFPTFMtXCaeDisxn8mGZaJm954EpeaXp5nN1JPM/gcG6X9gQ2lDc8+RI GwsM5IjPingZcbL7VA8ngfxY/vGKxBU46jU5QRWsTdMKez+2UYlbpfU23e9d2Rdh92jN iHBdbwogF9B9UPr036U2fbOYfC8laXlvpRHynGWSUPfnr4luuQ5a71ozGwL9yEqQ5yRr 8tSSoVu2OT2GD0yO7QHj6rEqS3RRNk2x/R5WRmnhi8UupTdwZ/G1nDmYvYGiFwoOlmTS r3EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=+drNVTTsqEuR91JHF5TFvYIDh5n/3YjIQhqyL2kK10o=; b=r8rZuVRFj/gGN9zUC7QPuISzacIpoU1zRBQzuhkB6HDyWgr2dLwYTz+KQwuzLYRc4U 2NqR2ea5mvSdBZB9f0rDlRjGlAUWXcR03SUXceml9Tj67Oj2GxySHaJaAoeAL19+Q4zz x061FgPN4vJ0wkT6eYG6es3HfDyOmEbGlIsx/4h7H1tu+t1dqCddwD1LNF8yjGJz2sJr +55CoSCt/18PvVLh+pSfnKHsyByc/cmtMCbdKmeYE/12ZigsPd+a4wSezwj5do9NSvyj rRZzgZ9PfPPwt4X/fRvRNRaXLseb827Sa9BZVfnBroxGHPRRj+1AUPGxq2+Nv2l6KKQx BYEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E2YdKNcI; 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=fail (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 g25-20020ac87759000000b002de8d9a1bfesi3992607qtu.71.2022.03.01.02.10.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Mar 2022 02:10:59 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=E2YdKNcI; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOzT8-0006ea-Cf for patch@linaro.org; Tue, 01 Mar 2022 05:10:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOz6S-0003NM-FA for qemu-devel@nongnu.org; Tue, 01 Mar 2022 04:47:32 -0500 Received: from [2a00:1450:4864:20::42c] (port=39467 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOz6Q-00078l-SW for qemu-devel@nongnu.org; Tue, 01 Mar 2022 04:47:32 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ay10so1678995wrb.6 for ; Tue, 01 Mar 2022 01:47:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+drNVTTsqEuR91JHF5TFvYIDh5n/3YjIQhqyL2kK10o=; b=E2YdKNcIqURI3J0LETv88W8IePYyTTOQbek7itkMhc1S185i4OOe1VzLFkCoTtxzG0 y+Fs9FMRO8X1apRwTeFcHrR8WkWCCgpOjJ+COv3J+Fwd6AR4BYHmFF97bgG+RvpuRUgu VAni9HzcITVMgzV7Rk9Ng+OrK7RlbHKuh6y+ROxIH4DEu8zLipFlvCWomr0RhLyIAhJl YkP3r30/ZOI/T+EPHxWXI39h3OFjbWHtQ4IIUlAfEm7ovard2VD/F3mCpHQ6JbZ0SlAh wQ8/QrzqEuPItAvWoatwbEo+7XXDZSTVJioWom/uj1qX9UAJpgr8b5x1M41G8WEMSyaU vBrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+drNVTTsqEuR91JHF5TFvYIDh5n/3YjIQhqyL2kK10o=; b=obGzHz2ewVjkXvEdI+0S/oyM7Z42pzv9mhFw/rUTMbhj/N4sSWVqNjnzUPNSASNz3u 64Y4WSM8rvtXjk3/rvPbhM8J42LtdUjqAXa+S/0d3yHYnSaAtsy5FaBQiGzcp7HzvhPR ZGZdsb0LmkwzKObV9pHsN83+wh/pXkJUTdvidoE/3RaHECJMA+z+PO4OCiu64Dtm/e7L aGlXnqk2joOeCFt6jGiGvNHrS/LjYmxcGeQENpMtjZQYYVpb4PhZhbCJ+rns10WAs5zu M/QCVQXAryXP9M1KFtRUobw7+chbkvk8EUGzu1Fn+hahTzC0+i2eirbfuwTNDT17irQs Hd+A== X-Gm-Message-State: AOAM530AUQjbZuSKZgegiN7ZExgWqxXXoU7/g//IyaNvRNahj8jlgL6K twkhIUO9F1e2eQW9v4r4WksC0g== X-Received: by 2002:adf:816c:0:b0:1e6:88a9:eb6c with SMTP id 99-20020adf816c000000b001e688a9eb6cmr18504006wrm.645.1646128049611; Tue, 01 Mar 2022 01:47:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t8-20020a5d6908000000b001e3169cc6afsm13284863wru.94.2022.03.01.01.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 01:47:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB56A1FFBE; Tue, 1 Mar 2022 09:47:15 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/18] tests/docker: introduce debian-riscv64-test-cross Date: Tue, 1 Mar 2022 09:47:03 +0000 Message-Id: <20220301094715.550871-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220301094715.550871-1-alex.bennee@linaro.org> References: <20220301094715.550871-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Beraldo Leal , Richard Henderson , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cross building QEMU for riscv64 still involves messing about with sid and ports. However for building tests we can have a slimmer compiler only container which should be more stable. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220225172021.3493923-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index d38f657131..e622ac2d21 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -131,6 +131,13 @@ riscv64-debian-cross-container: variables: NAME: debian-riscv64-cross +# we can however build TCG tests using a non-sid base +riscv64-debian-test-cross-container: + extends: .container_job_template + stage: containers-layer2 + variables: + NAME: debian-riscv64-test-cross + s390x-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index cce9faab36..e495b163a0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -214,6 +214,7 @@ docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 docker-image-debian-powerpc-test-cross: docker-image-debian11 +docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross @@ -222,6 +223,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-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-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker new file mode 100644 index 0000000000..1d90901298 --- /dev/null +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -0,0 +1,12 @@ +# +# Docker cross-compiler target +# +# This docker target builds on the Debian Bullseye base image. +# +FROM qemu/debian11 + +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + gcc-riscv64-linux-gnu \ + libc6-dev-riscv64-cross diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index adc95d6a44..0663bd19f4 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -180,7 +180,7 @@ for target in $target_list; do ;; riscv64-*) container_hosts=x86_64 - container_image=debian-riscv64-cross + container_image=debian-riscv64-test-cross container_cross_cc=riscv64-linux-gnu-gcc ;; s390x-*)