From patchwork Thu Dec 15 16:15:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16777 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E04E4C4332F for ; Thu, 15 Dec 2022 16:16:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.137392.1671120969545981243 for ; Thu, 15 Dec 2022 08:16:09 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9A7351063; Thu, 15 Dec 2022 08:16:49 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7E9F43F73B; Thu, 15 Dec 2022 08:16:08 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 1/8] CI: add variables needed for k8s runners Date: Thu, 15 Dec 2022 16:15:59 +0000 Message-Id: <20221215161606.1194188-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:12 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4185 The Kas container needs to use the entrypoint as that is where the user changes from root to a normal user. Also set the KUBERNETES_CPU_REQUEST to the variable CPU_REQUEST as this needs to be tuned per-deployment. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 127a35bb..45d9902e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,11 @@ image: ghcr.io/siemens/kas/kas:latest-release +# These are needed as the k8s executor doesn't respect the container entrypoint +# by default +variables: + FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0 + FF_KUBERNETES_HONOR_ENTRYPOINT: 1 + stages: - prep - build @@ -30,6 +36,8 @@ stages: # Generalised fragment to do a Kas build .build: extends: .setup + variables: + KUBERNETES_CPU_REQUEST: $CPU_REQUEST script: - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME") - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf' From patchwork Thu Dec 15 16:16:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0020C46467 for ; Thu, 15 Dec 2022 16:16:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.137393.1671120970568229993 for ; Thu, 15 Dec 2022 08:16:10 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4746C1424; Thu, 15 Dec 2022 08:16:50 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2B8543F73B; Thu, 15 Dec 2022 08:16:09 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 2/8] CI: add tags to all jobs Date: Thu, 15 Dec 2022 16:16:00 +0000 Message-Id: <20221215161606.1194188-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:12 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4186 Tag all jobs with the DEFAULT_TAG variable so each instance can control what tags the jobs have, whilst still explicitly tagging the jobs which need specific tags (such as x86_64 for jobs which need to run x86-only binaries) Signed-off-by: Ross Burton --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45d9902e..16ded78d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,8 @@ stages: # Common job fragment to get a worker ready .setup: + tags: + - $DEFAULT_TAG stage: build interruptible: true variables: @@ -262,6 +264,8 @@ machine-coverage: script: - ./ci/check-machine-coverage coverage: '/Coverage: \d+/' + tags: + - x86_64 metrics: extends: .setup From patchwork Thu Dec 15 16:16:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16780 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F00DDC25B04 for ; Thu, 15 Dec 2022 16:16:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.138300.1671120970609302741 for ; Thu, 15 Dec 2022 08:16:10 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E7C7B169C; Thu, 15 Dec 2022 08:16:50 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CC3203F73B; Thu, 15 Dec 2022 08:16:09 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 3/8] CI: use the .setup fragment in machine-coverage Date: Thu, 15 Dec 2022 16:16:01 +0000 Message-Id: <20221215161606.1194188-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:12 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4187 Signed-off-by: Ross Burton --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16ded78d..21bdb127 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,13 +259,10 @@ pending-updates: # What percentage of machines in the layer do we build machine-coverage: - stage: build - interruptible: true + extends: .setup script: - ./ci/check-machine-coverage coverage: '/Coverage: \d+/' - tags: - - x86_64 metrics: extends: .setup From patchwork Thu Dec 15 16:16:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16778 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E23DFC2D0CC for ; Thu, 15 Dec 2022 16:16:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.137394.1671120971258565210 for ; Thu, 15 Dec 2022 08:16:11 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9437B1063; Thu, 15 Dec 2022 08:16:51 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 78C4B3F73B; Thu, 15 Dec 2022 08:16:10 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 4/8] CI: no need to install telnet Date: Thu, 15 Dec 2022 16:16:02 +0000 Message-Id: <20221215161606.1194188-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:12 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4188 The kas 3.1 container has telnet in. We can also remove python3-subunit once kas 3.2 is released. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21bdb127..7c4a354b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,8 @@ stages: - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR # Must do this here, as it's the only way to make sure the toolchain is installed on the same builder - ./ci/get-binary-toolchains $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR - - sudo apt update && sudo apt install --yes telnet python3-subunit + # This can be removed with Kas 3.2 + - sudo apt-get update && sudo apt-get install --yes python3-subunit # Generalised fragment to do a Kas build .build: From patchwork Thu Dec 15 16:16:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1714C4167B for ; Thu, 15 Dec 2022 16:16:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.138301.1671120971915653665 for ; Thu, 15 Dec 2022 08:16:12 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 40BE31424; Thu, 15 Dec 2022 08:16:52 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 253A63F73B; Thu, 15 Dec 2022 08:16:11 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 5/8] CI: define DEFAULT_TAG Date: Thu, 15 Dec 2022 16:16:03 +0000 Message-Id: <20221215161606.1194188-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:12 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4189 From: Jon Mason DEFAULT_TAG is being used to help with internal Gitlab pipeline setups know which type of machines to run on, but has not value outside of Arm Corp. Gitlab CI allows for variables to be overridden by default. So, we can give it a default value of NULL/empty and have everything work internally and externally by default. Signed-off-by: Jon Mason --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c4a354b..706cfada 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ stages: TOOLCHAIN_DIR: $CI_BUILDS_DIR/persist/toolchains IMAGE_DIR: $CI_PROJECT_DIR/work/build/tmp/deploy/images TOOLCHAIN_LINK_DIR: $CI_PROJECT_DIR/work/build/toolchains + DEFAULT_TAG: "" before_script: - echo KAS_WORK_DIR = $KAS_WORK_DIR - echo SSTATE_DIR = $SSTATE_DIR From patchwork Thu Dec 15 16:16:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16784 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7338C4332F for ; Thu, 15 Dec 2022 16:16:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.138302.1671120972641580863 for ; Thu, 15 Dec 2022 08:16:12 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E18A0169C; Thu, 15 Dec 2022 08:16:52 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C5F073F73B; Thu, 15 Dec 2022 08:16:11 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 6/8] arm/trusted-firmware-m: remove compiler options Date: Thu, 15 Dec 2022 16:16:04 +0000 Message-Id: <20221215161606.1194188-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4190 The recipe supports the use of both Arm's binary GCC (aka GNU Arm Embedded Compiler, or gnu-rm) and binary Clang (aka Arm Compiler). However, armcompiler was never tested and doesn't work: 6.17 does a network operation on every call to check the license which fails with the network isolation in do_compile tasks, and 6.18 is behind a loginwall so we can't automatically fetch it in a recipe. Simplify the recipe to hardcode the use of gnu-rm, and remove the clang support. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../trusted-firmware-m/trusted-firmware-m_1.5.0.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb index 0e0f8608..5e28f634 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.5.0.bb @@ -48,6 +48,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "cmake-native \ ninja-native \ + gcc-arm-none-eabi-native \ python3-intelhex-native \ python3-jinja2-native \ python3-pyyaml-native \ @@ -68,14 +69,14 @@ python() { raise bb.parse.SkipRecipe("TFM_PLATFORM needs to be set") } -PACKAGECONFIG ??= "cc-gnuarm" -# What compiler to use -PACKAGECONFIG[cc-gnuarm] = "-DTFM_TOOLCHAIN_FILE=${S}/toolchain_GNUARM.cmake,,gcc-arm-none-eabi-native" -PACKAGECONFIG[cc-armclang] = "-DTFM_TOOLCHAIN_FILE=${S}/toolchain_ARMCLANG.cmake,,armcompiler-native" +PACKAGECONFIG ??= "" # Whether to integrate the test suite PACKAGECONFIG[test-secure] = "-DTEST_S=ON,-DTEST_S=OFF" PACKAGECONFIG[test-nonsecure] = "-DTEST_NS=ON,-DTEST_NS=OFF" +# Currently we only support using the Arm binary GCC +EXTRA_OECMAKE += "-DTFM_TOOLCHAIN_FILE=${S}/toolchain_GNUARM.cmake" + # Don't let FetchContent download more sources during do_configure EXTRA_OECMAKE += "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" From patchwork Thu Dec 15 16:16:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16782 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB0E5C46467 for ; Thu, 15 Dec 2022 16:16:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.137395.1671120973277982693 for ; Thu, 15 Dec 2022 08:16:13 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8E1741063; Thu, 15 Dec 2022 08:16:53 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 72A6C3F73B; Thu, 15 Dec 2022 08:16:12 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 7/8] arm-toolchain/armcompiler: remove recipe Date: Thu, 15 Dec 2022 16:16:05 +0000 Message-Id: <20221215161606.1194188-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4191 As far as we know nobody is actually using the Arm Compiler recipe: 6.17 does a network operation on every call to check the license and this fails with the network isolation that do_compile has in kirkstone, and 6.18 is behind a loginwall so we cannot download it in a recipe. Unless we have actual users asking for a recipe, remove it from the layer to avoid confusion. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-toolchain/conf/layer.conf | 3 - .../armcompiler/no-uname.patch | 14 ----- .../armcompiler_6.17.bb | 55 ------------------- 3 files changed, 72 deletions(-) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler/no-uname.patch delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf index dd54db82..3cb8b064 100644 --- a/meta-arm-toolchain/conf/layer.conf +++ b/meta-arm-toolchain/conf/layer.conf @@ -10,6 +10,3 @@ BBFILE_PRIORITY_arm-toolchain = "5" LAYERDEPENDS_arm-toolchain = "core" LAYERSERIES_COMPAT_arm-toolchain = "kirkstone" - -# These variables are used for armcompiler license -BB_BASEHASH_IGNORE_VARS:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE" diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler/no-uname.patch b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler/no-uname.patch deleted file mode 100644 index 7c958079..00000000 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler/no-uname.patch +++ /dev/null @@ -1,14 +0,0 @@ -The install script has an explicit check that the current host is x86-64, which -means we can't build armcompiler for x86-64 targets on arm64. Pad the -replacement host with whitespace so that the installer offset doesn't change. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - ---- a/install_x86_64.sh.orig 2021-07-06 14:11:47.632155370 +0100 -+++ b/install_x86_64.sh 2021-07-06 14:11:58.393163350 +0100 -@@ -470,3 +470,3 @@ - fi --host=`/bin/uname -m` -+host=x86_64 - echo --- Host target check...[${host}] diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb deleted file mode 100644 index 938dbc2c..00000000 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-License-Identifier: MIT -# -# Copyright (c) 2020 Arm Limited -# - -require arm-binary-toolchain.inc - -SUMMARY = "Baremetal Armcompiler for Cortex-A, Cortex-R and Cortex-M processors" -HOMEPAGE = "https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/version-6" - -# Certain features of armcompiler requires a license. For more information, please refer to the armcompiler user guide: -# https://developer.arm.com/tools-and-software/software-development-tools/license-management/resources/product-and-toolkit-configuration -# Usually set and export of these variables are required: -# ARM_TOOL_VARIANT, ARMLMD_LICENSE_FILE, LM_LICENSE_FILE - -LICENSE = "Armcompiler-License-agreement & Armcompiler-Redistributables & \ - Armcompiler-Supplementary-terms & Armcompiler-Third-party-licenses" - -NO_GENERIC_LICENSE[Armcompiler-License-agreement] = "license_terms/license_agreement.txt" -NO_GENERIC_LICENSE[Armcompiler-Redistributables] = "license_terms/redistributables.txt" -NO_GENERIC_LICENSE[Armcompiler-Supplementary-terms] = "license_terms/supplementary_terms.txt" -NO_GENERIC_LICENSE[Armcompiler-Third-party-licenses] = "license_terms/third_party_licenses.txt" - -# The Arm Compiler is under a EULA, read this at the homepage above and if you -# agree add 'armcompiler' to your LICENSE_FLAGS_ACCEPTED. -LICENSE_FLAGS = "armcompiler" - -LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=19faf912b534478d28f60dfa24659c17 \ - file://license_terms/redistributables.txt;md5=c22d8d2388d8e592f4b135f87bb243da \ - file://license_terms/supplementary_terms.txt;md5=e2443a4a7c520e79ebb603c8ba509076 \ - file://license_terms/third_party_licenses.txt;md5=53b42e7d31259bdc174b9c03651ed1b7 " - -ARMCLANG_VERSION = "DS500-BN-00026-r5p0-19rel0" - -COMPATIBLE_HOST = "x86_64.*-linux" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/compiler/${ARMCLANG_VERSION}.tgz;subdir=${ARMCLANG_VERSION} \ - file://no-uname.patch" -SRC_URI[sha256sum] = "0ed2c3a2e416f07b892250fcbcca4b27353b046a030a433bf6dddc0db802885c" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/" -UPSTREAM_CHECK_REGEX = "Download Arm Compiler.*,(?P[\d\.]+)" - -S = "${WORKDIR}/${ARMCLANG_VERSION}" - -do_install() { - install -d ${D}${bindir} ${D}${libexecdir}/${BPN}/ - # Commercial license flag set, so recipe will only install when explicitly agreed to it already - ${S}/install_x86_64.sh --i-agree-to-the-contained-eula -d ${D}${libexecdir}/${BPN}/ --no-interactive - - # Symlink all executables into bindir - for f in ${D}${libexecdir}/${BPN}/bin/*; do - ln -rs $f ${D}${bindir}/$(basename $f) - done -} From patchwork Thu Dec 15 16:16:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 16783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAC5FC4167B for ; Thu, 15 Dec 2022 16:16:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.137396.1671120973862196060 for ; Thu, 15 Dec 2022 08:16:13 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3AC121424; Thu, 15 Dec 2022 08:16:54 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1F2FE3F73B; Thu, 15 Dec 2022 08:16:13 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH][kirkstone 8/8] CI: remove armcompiler references Date: Thu, 15 Dec 2022 16:16:06 +0000 Message-Id: <20221215161606.1194188-8-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215161606.1194188-1-ross.burton@arm.com> References: <20221215161606.1194188-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Dec 2022 16:16:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4192 Arm Compiler has been removed, so remove it from the CI. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- ci/base.yml | 2 +- ci/toolchains.yml | 2 -- scripts/machine-summary.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index 6cb18589..2c127290 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -30,7 +30,7 @@ local_conf_header: CONF_VERSION = "2" BB_NUMBER_THREADS = "16" PARALLEL_MAKE = "-j16" - LICENSE_FLAGS_ACCEPTED += "armcompiler Arm-FVP-EULA" + LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" setup: | PACKAGE_CLASSES = "package_ipk" PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" diff --git a/ci/toolchains.yml b/ci/toolchains.yml index d2dc2961..080d8d97 100644 --- a/ci/toolchains.yml +++ b/ci/toolchains.yml @@ -11,9 +11,7 @@ local_conf_header: toolchains: | SDKMACHINE = "x86_64" -# No target armcompiler as currently there is no arm64 build target: - - nativesdk-armcompiler - gcc-aarch64-none-elf - nativesdk-gcc-aarch64-none-elf - gcc-arm-none-eabi diff --git a/scripts/machine-summary.py b/scripts/machine-summary.py index 47d8ff34..c2b43dae 100755 --- a/scripts/machine-summary.py +++ b/scripts/machine-summary.py @@ -145,7 +145,6 @@ recipes = ("virtual/kernel", "edk2-firmware", "u-boot", "optee-os", - "armcompiler-native", "gcc-aarch64-none-elf-native", "gcc-arm-none-eabi-native")