From patchwork Fri Feb 11 16:03: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: 541795 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp3212829imo; Fri, 11 Feb 2022 08:14:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0UZhlHSlBCPKWD0Hnf4zivQvUxvN+PnzQmZjT/eaPMShrs6bCa3miZSbmPTKI8WXH+qIs X-Received: by 2002:a81:611:: with SMTP id 17mr2351956ywg.511.1644596088063; Fri, 11 Feb 2022 08:14:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644596088; cv=none; d=google.com; s=arc-20160816; b=nCh7BQPHSHsJrbLZ+BwQ61rEXq46td3zt45wHTKvFsOXFdYIh/1HOYuBn/wUFItNm4 z5io1O3nQ3kZixK632c4AzMPYLvTgiMltxyyFdPu7nNqFvCFEZu7MC63z1NoA8QMveKG 5atXnLbbeM7uGsKUW1Iv+GjAwYgdXJg/jaowaTH82q2I9gVKD/+y+oiGDxamWvJmEw6x /zqy8DhpMf0034Xm6skTaiLRGhg9HNkch5HTiG/juxAh1ZgLuQipXcLzKwKv5pfAj/k1 GRO0YKHiNvmZdoATz2DDOGgzIzk/RPhIfsjFVesY/9ccTYU51fVxlptvdPb0h8tuBdM6 ZDIg== 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=UTRCyQOf19YxllG63yzv6vaS7/CLeP7yg7egCWkgLEI=; b=F0VZ3NqSqBNmuOaebqthh9egBhzk6K3od+TZnsYVjs2u3sDd8cyfA9cH5/nwuFsn3m n5ckhlVBWx0odyp17JnsAiGIAjwPnii/F52gtwqQGx7Cmfq3VDRYKdzXy8GDLifP9g9m wKe/URkPulqdzBHgLKe1Lersubqc168p9WaxF7tjAw9C4pX0g5LjVFpNh2corB2+/ANL eGPGIL/kSkFAqVOkqEWhXJnubYVQwA7Ap+lEvyj9BZYQiLhnVuhDCyFhhYgbtLymqyj5 TpIeWhNvuvWqIoYCCpBKC+4QZ2C1M93DTecIXpHBIi6Sr0Ou45HpjXB/nf19q8w3Zp+u CjHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aQt3qGt2; 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 h64si17007889ywh.94.2022.02.11.08.14.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Feb 2022 08:14:48 -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=aQt3qGt2; 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]:35926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIYZL-0004ZK-Ex for patch@linaro.org; Fri, 11 Feb 2022 11:14:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIYOf-0007U4-UU for qemu-devel@nongnu.org; Fri, 11 Feb 2022 11:03:45 -0500 Received: from [2a00:1450:4864:20::62f] (port=41593 helo=mail-ej1-x62f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIYOb-0005BV-Pl for qemu-devel@nongnu.org; Fri, 11 Feb 2022 11:03:45 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a8so23890034ejc.8 for ; Fri, 11 Feb 2022 08:03:20 -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=UTRCyQOf19YxllG63yzv6vaS7/CLeP7yg7egCWkgLEI=; b=aQt3qGt2wZzIWDspxAVAE/LXEPi+mUPus0lWHPyix3z1EzgvZNOXpjgbDKSs1G/M3d rNKVqu7Rsd0bWuLZDfzx1o1EbGcN3hUT5mUhPmm7bB61HNy4mXTXDtyh8FJOC/9lWI3W rncq+Z3nqwyb8rAbUFJnxETxJRHXGY9Q0zgOlvbvsJjjXP+7gPfbJo8Wr0ov/lirK/9o SqYX2pFNcELRQqYG7v7NnEAjFyCmJvSglixR1Q/OHabuCyMl08BWtvZic4NNewQb3kf3 Kk0E6p9nxpubI4mVI+ycLnCuuaCA9wWffKvVBBh1VT+YWFj8rryVnNHq/NofkavhL2VS mG1w== 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=UTRCyQOf19YxllG63yzv6vaS7/CLeP7yg7egCWkgLEI=; b=CUfiQqvUm+tcIPxGvTeQOQOuW/q2yUhPxJr+Xam30tStxaRqwGk2jz0Z/utYAXfGLI swt+DO8+XXrDZaceKk4Unz/WXcAuU6Fydjiuo+u59PboMZcfr8EUZpVHc64ndLqu0/un XLYvRMCkjO1GKjdqevVn7ng8qpK/UUiYfWkV1A57kh5riHwYKg7XEF2uhkyeKcZUxLbs Z8LbRJJlUVkY3v10U/YxbLZ/0TbGEg8y+fSm/402oPlmCwQDCbOhuwgxBmgnWR5/IOm3 4pg7FPX1ZYj18uQ4wgkDk0hTpTWlOxFRKRkZnM3XsjMGqTE2jKlgqqpgwezHUaa+XvNS WIeA== X-Gm-Message-State: AOAM531RoR8zpvB70EAbbiEHT5giUu5yvyUJrbOg+QkF4NZ3SoYW2SZi sczT/kxf+bl0Rx8cYnpLPGOp1A== X-Received: by 2002:a17:906:29cb:: with SMTP id y11mr2053904eje.49.1644595399078; Fri, 11 Feb 2022 08:03:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c1sm8209726ejn.203.2022.02.11.08.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Feb 2022 08:03:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 343671FFBD; Fri, 11 Feb 2022 16:03:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/11] tests/docker: introduce debian-riscv64-test-cross Date: Fri, 11 Feb 2022 16:03:03 +0000 Message-Id: <20220211160309.335014-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220211160309.335014-1-alex.bennee@linaro.org> References: <20220211160309.335014-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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.001, 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, Wainer dos Santos Moschetta , qemu-arm@nongnu.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net 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 --- .gitlab-ci.d/container-cross.yml | 7 +++++++ tests/docker/Makefile.include | 2 ++ .../dockerfiles/debian-riscv64-test-cross.docker | 12 ++++++++++++ tests/tcg/configure.sh | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/docker/dockerfiles/debian-riscv64-test-cross.docker diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index ed620620f8..65fc689a6b 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-layer2 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index eeee1e6bdf..2ac2ea95f9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -215,6 +215,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 @@ -223,6 +224,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-*)