From nobody Thu Apr 25 22:22:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631646072366226.1818637660017; Tue, 14 Sep 2021 12:01:12 -0700 (PDT) Received: from localhost ([::1]:55892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQDg7-0002GX-4B for importer@patchew.org; Tue, 14 Sep 2021 15:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQDdc-0000UX-1n for qemu-devel@nongnu.org; Tue, 14 Sep 2021 14:58:36 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:40686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQDda-0003t4-54 for qemu-devel@nongnu.org; Tue, 14 Sep 2021 14:58:35 -0400 Received: by mail-pg1-x52f.google.com with SMTP id h3so98581pgb.7 for ; Tue, 14 Sep 2021 11:58:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id hi12sm2151229pjb.48.2021.09.14.11.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 11:58:32 -0700 (PDT) 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=24oT+aOoPiknzfcDaOiPN4P8Jm/+4h1y9+gf/YXbwBU=; b=gI/wXpiSeUWrbyB1G8zqiQu5gRlWtLe9uTj6ZeYr6H5pfZZVSqnSsV6CgDPzon/YlU SKG1+NHD/Qhgky6ObDJcX0Qq7V6HQ89ts9v31JFcZAYLz3fy5t1yUvcOsfsWriosJrKS hTJzDgDwZP9BSbaRgQer+E+du4vnLyA7yY7L4+23GKrKlNpSaPYGJMJBUlzw/l7V65o2 WGwUxW19m8Xkjk3KCfhzL5120brxohiqZYQ3iqRNgHKTWbO9uoV0le7xfRtNWaOtdM8e zL/L6ESDFU8e6rLdYaGS1AM0BSxzY6LEUiP0nXxbtcY1qBWLdGg3KKoLxGnzt6GgFFkA kLpQ== 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=24oT+aOoPiknzfcDaOiPN4P8Jm/+4h1y9+gf/YXbwBU=; b=wTA1cbB4qASAC5jeHgKb9zjQBMKmR9ESkjiDR9sLDGpc4wZS7ZPjyzQ3IKOTtzM8ON ViOb8iZln9Ohowp4YjVlWEUIAAGIRyxeSNHZR+Ch3L53nTmMqQFe1PE2xA6fm/GHoyXE yrtEtZ31YMn2rb/DDRjM7PosoHY3ZapuN72WgJRGWzTgdLK4O1QbZg0EIulSFtLtoWVS g5I/HZJDnQpjpQPon5BMgj+4OiRg/pS3VD3V89Hm6Rv5Erw4KjwWexNakQw32x0lFIdJ x9HAg3qB1AXlNO1N15qwDnpzcB1UVwKsfYuKGn2ymIa4ZzXpWcA2VB3l5thTvuaXVeQz WDoQ== X-Gm-Message-State: AOAM5323mtnFWdpkbxltMpyWVTgZhEdNsdjWFa0/UMSkc4X/0ZbASioZ z0zfkRgLBUHLsC48oDLn//lpwMd1lykPsw== X-Google-Smtp-Source: ABdhPJxg8rMDbnCGcKYIWH0hGNe6PiGFcdL8f11UXuurL6pc3JEW+2A/sg8ZiwDJzdiyCQHIPQMGng== X-Received: by 2002:a62:b515:0:b0:438:42ab:2742 with SMTP id y21-20020a62b515000000b0043842ab2742mr6259376pfe.77.1631645912563; Tue, 14 Sep 2021 11:58:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/2] tests/docker: promote debian-riscv64-cross to a full image Date: Tue, 14 Sep 2021 11:58:29 -0700 Message-Id: <20210914185830.1378771-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914185830.1378771-1-richard.henderson@linaro.org> References: <20210914185830.1378771-1-richard.henderson@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=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: willianr@redhat.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , thuth@redhat.com, alex.bennee@linaro.org, wainersm@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631646073479100001 From: Alex Benn=C3=A9e To be able to cross build QEMU itself we need to include a few more libraries. These are only available in Debian's unstable ports repo for now so we need to base the riscv64 image on sid with the the minimal libs needed to build QEMU (glib/pixman). The result works but is not as clean as using build-dep to bring in more dependencies. However sid is by definition a shifting pile of sand and by keeping the list of libs minimal we reduce the chance of having an image we can't build. It's good enough for a basic cross build testing of TCG. Cc: "Daniel P. Berrang=C3=A9" Signed-off-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 2 - .../dockerfiles/debian-riscv64-cross.docker | 46 +++++++++++++++++-- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 0fcebe363a..05996200e1 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -134,7 +134,6 @@ ppc64el-debian-cross-container: riscv64-debian-cross-container: extends: .container_job_template stage: containers-layer2 - needs: ['amd64-debian10-container'] variables: NAME: debian-riscv64-cross =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ff5d732889..3b03763186 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -141,7 +141,6 @@ docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-mips64el-cross: docker-image-debian10 docker-image-debian-mipsel-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 -docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 @@ -180,7 +179,6 @@ DOCKER_PARTIAL_IMAGES +=3D debian-arm64-test-cross DOCKER_PARTIAL_IMAGES +=3D debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES +=3D debian-hppa-cross DOCKER_PARTIAL_IMAGES +=3D debian-m68k-cross debian-mips64-cross -DOCKER_PARTIAL_IMAGES +=3D debian-riscv64-cross DOCKER_PARTIAL_IMAGES +=3D debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross DOCKER_PARTIAL_IMAGES +=3D debian-xtensa-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index 2bbff19772..594d97982c 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,12 +1,48 @@ # -# Docker cross-compiler target +# Docker cross-compiler target for riscv64 # -# This docker target builds on the debian Buster base image. +# Currently the only distro that gets close to cross compiling riscv64 +# images is Debian Sid (with unofficial ports). As this is a moving +# target we keep the library list minimal and are aiming to migrate +# from this hack as soon as we are able. # -FROM qemu/debian10 +FROM docker.io/library/debian:sid-slim + +# Add ports +RUN apt update && \ + DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=3Dnoninteractive eatmydata apt update -yy && \ + DEBIAN_FRONTEND=3Dnoninteractive eatmydata apt upgrade -yy + +# Install common build utilities +RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata apt install -yy \ + bc \ + build-essential \ + ca-certificates \ + debian-ports-archive-keyring \ + dpkg-dev \ + gettext \ + git \ + ninja-build \ + pkg-config \ + python3 + +# Add ports and riscv64 architecture +RUN echo "deb http://ftp.ports.debian.org/debian-ports/ sid main" >> /etc/= apt/sources.list +RUN dpkg --add-architecture riscv64 + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ - gcc-riscv64-linux-gnu \ - libc6-dev-riscv64-cross + gcc-riscv64-linux-gnu \ + libc6-dev-riscv64-cross \ + libffi-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libpixman-1-dev:riscv64 + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Driscv64-linux-gnu- +ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user --=20 2.25.1 From nobody Thu Apr 25 22:22:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631646438763811.2779993802175; Tue, 14 Sep 2021 12:07:18 -0700 (PDT) Received: from localhost ([::1]:60854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQDm1-0006Rc-QV for importer@patchew.org; Tue, 14 Sep 2021 15:07:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQDde-0000Wl-FS for qemu-devel@nongnu.org; Tue, 14 Sep 2021 14:58:38 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:47065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQDda-0003ta-FW for qemu-devel@nongnu.org; Tue, 14 Sep 2021 14:58:38 -0400 Received: by mail-pl1-x633.google.com with SMTP id bg1so8871153plb.13 for ; Tue, 14 Sep 2021 11:58:34 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id hi12sm2151229pjb.48.2021.09.14.11.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 11:58:32 -0700 (PDT) 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=lq1biEQZ8k9CzIW5Mm8h1QqVVW+FFF3SxIW1mjztbL8=; b=PHGaP4jSmIPJphKdBP70PV47AfQ6BQAwFDRkFM2q57r/pXL2Rfrmm31aGb6UqKnvln YM+Lt7Jevef+GoZuahkNySDLeRFggPCQrAQ7LZSkd4JAKLPnPm3B6F/ohDhyqivomB4B LqgyR22XK4ZmnJ5OvWhe8x4IlbTSv3Esa5/rL4r5l/je60OWsypAl849zil8JHAEtoDB p73fAYCulPE6bnhOcEuQq8lGhZ4WuHTbP0BvrQ4aXcOtXVsECWsX6n9UV1TibU5C8jRv lyEOn4HvuR7Xm6SHrOYL+FxmB8/I0gXi5SFh78O89CkjKHnHkU+/96fsYYB0jFgg+UKT GLcA== 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=lq1biEQZ8k9CzIW5Mm8h1QqVVW+FFF3SxIW1mjztbL8=; b=era6mKWzO7yLWzYMPth8EJIL91Uupl9kl+CvmElER6NpSB23e9iYbNzyY8LRyCp11x IM5iCS02XSHOWfYlmav3d2l4QyV7PJd9IZG/uDYZlfOGyhtEAyVqZMMQZC8jq9XFPWiN B7Z2Cy+xZ7DTWTcCow1tJQNzLu9v/S5YpFyJaPtyqb2+KnFAV6vTMYIEn+3DiMKCWSdy /ujTkWQgSXTavesaOFHAtMYl0k5D+7FwMvFf3LcrmJMrPXOq0iLYjUMfOh5h8ESjSTi3 YXt0GAfrLOCG9tF+86NXh/RB4UsNspfa/n5sbEBgpg0LbF3vf7mR0ebYic1wKfmb1dCp OCkg== X-Gm-Message-State: AOAM531GAkhcQcNyfGmkQ1FYrCCr1+wVeKUQlMliCdemqriC5OHEZ0u8 SADAE6g2YlbKWfthbArFCpI8t/2Lj0mlkw== X-Google-Smtp-Source: ABdhPJwiJGPcVApSxZ5YXQ6FyJDnJTXov99FbgRY3cYmrIyiIIt+QF3Gb+B63P/nJLzUmK8KHiJyVw== X-Received: by 2002:a17:90b:3a8c:: with SMTP id om12mr3798291pjb.137.1631645913196; Tue, 14 Sep 2021 11:58:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/2] gitlab: Add cross-riscv64-system, cross-riscv64-user Date: Tue, 14 Sep 2021 11:58:30 -0700 Message-Id: <20210914185830.1378771-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914185830.1378771-1-richard.henderson@linaro.org> References: <20210914185830.1378771-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: willianr@redhat.com, thuth@redhat.com, alex.bennee@linaro.org, wainersm@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631646440696100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/crossbuilds.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index f10168db2e..0fe4a55ac5 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -124,6 +124,20 @@ cross-ppc64el-user: variables: IMAGE: debian-ppc64el-cross =20 +cross-riscv64-system: + extends: .cross_system_build_job + needs: + job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + +cross-riscv64-user: + extends: .cross_user_build_job + needs: + job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + cross-s390x-system: extends: .cross_system_build_job needs: --=20 2.25.1