From patchwork Wed May 4 14:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 7552 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 C5546C433F5 for ; Wed, 4 May 2022 14:13:08 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.6991.1651673578407425048 for ; Wed, 04 May 2022 07:12:58 -0700 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 19AEA1042; Wed, 4 May 2022 07:12:58 -0700 (PDT) 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 969323F85F; Wed, 4 May 2022 07:12:57 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 1/3] arm-toolchain/arm-binary-toolchain: ensure toolchains don't provide any system libraries Date: Wed, 4 May 2022 15:12:52 +0100 Message-Id: <20220504141254.785384-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.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 ; Wed, 04 May 2022 14:13:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3354 Use PRIVATE_LIBS to ensure that the Arm binary toolchains don't provide their own libraries to the entire system. Signed-off-by: Ross Burton --- .../external-arm-toolchain/arm-binary-toolchain.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc index 1fa4cd3e..528b0061 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc @@ -20,4 +20,7 @@ INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# Need to mark these as private until do_package's soname-finder only looks in $libdir +PRIVATE_LIBS = "libgcc_s.so.1 libstdc++.so.6" + BBCLASSEXTEND = "native nativesdk" From patchwork Wed May 4 14:12:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 7554 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 C668BC4332F for ; Wed, 4 May 2022 14:13:08 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.7031.1651673579123248931 for ; Wed, 04 May 2022 07:12:59 -0700 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 B9D7B12FC; Wed, 4 May 2022 07:12:58 -0700 (PDT) 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 43F0F3F85F; Wed, 4 May 2022 07:12:58 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 2/3] arm/optee: remove redundant ${S} in LIC_FILES_CHKSUM Date: Wed, 4 May 2022 15:12:53 +0100 Message-Id: <20220504141254.785384-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504141254.785384-1-ross.burton@arm.com> References: <20220504141254.785384-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 ; Wed, 04 May 2022 14:13:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3355 Signed-off-by: Ross Burton --- meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb | 2 +- meta-arm/recipes-security/optee/optee-test.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb index 7ad408be..bafb2c47 100644 --- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb @@ -13,7 +13,7 @@ TOOLCHAIN = "gcc" inherit deploy python3native LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e" DEPENDS = "python3-pyelftools-native optee-os-tadevkit python3-cryptography-native " diff --git a/meta-arm/recipes-security/optee/optee-test.inc b/meta-arm/recipes-security/optee/optee-test.inc index 3ba87880..64b41a8e 100644 --- a/meta-arm/recipes-security/optee/optee-test.inc +++ b/meta-arm/recipes-security/optee/optee-test.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Open Portable Trusted Execution Environment - Test suite" HOMEPAGE = "https://www.op-tee.org/" LICENSE = "BSD-2-Clause & GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" inherit python3native ptest require optee.inc From patchwork Wed May 4 14:12:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 7553 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 BFCA6C433EF for ; Wed, 4 May 2022 14:13:08 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.7089.1651673579685055819 for ; Wed, 04 May 2022 07:13:00 -0700 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 684C01042; Wed, 4 May 2022 07:12:59 -0700 (PDT) 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 E69E83F85F; Wed, 4 May 2022 07:12:58 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 3/3] arm-bsp/corstone1000-*-image: mark these as corstone1000-specific Date: Wed, 4 May 2022 15:12:54 +0100 Message-Id: <20220504141254.785384-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504141254.785384-1-ross.burton@arm.com> References: <20220504141254.785384-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 ; Wed, 04 May 2022 14:13:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3356 We don't want world builds failing as they try to build these for machines other than Corstone 1000. Signed-off-by: Ross Burton --- meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb | 2 ++ meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb index d91d4578..ad5ec958 100644 --- a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb @@ -3,6 +3,8 @@ DESCRIPTION = "This is the main image which is the container of all the binaries generated for the Corstone1000 platform." LICENSE = "MIT" +COMPATIBLE_MACHINE = "corstone1000" + inherit image inherit wic_nopt diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb index a11de1e2..b778a008 100644 --- a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb @@ -3,6 +3,8 @@ DESCRIPTION = "This is the main Linux image which includes an initramfs kernel/r LICENSE = "MIT" +COMPATIBLE_MACHINE = "corstone1000" + IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" inherit core-image