From patchwork Mon Jul 7 18:30:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 66349 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 DE9F9C83F0A for ; Mon, 7 Jul 2025 18:30:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.521.1751913049970541424 for ; Mon, 07 Jul 2025 11:30:50 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 EF428168F for ; Mon, 7 Jul 2025 11:30:36 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 ESMTPA id DA3303F694 for ; Mon, 7 Jul 2025 11:30:48 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/5] CI: don't force testimage in fvp-base-ts Date: Mon, 7 Jul 2025 19:30:38 +0100 Message-ID: <20250707183042.1299783-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Mon, 07 Jul 2025 18:30:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6598 The caller should (and does) use ci/testimage.yml explicitly instead. Signed-off-by: Ross Burton --- ci/fvp-base-ts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/fvp-base-ts.yml b/ci/fvp-base-ts.yml index 21757c6cf5..112b092460 100644 --- a/ci/fvp-base-ts.yml +++ b/ci/fvp-base-ts.yml @@ -5,7 +5,6 @@ header: includes: - ci/fvp-base.yml - ci/meta-openembedded.yml - - ci/testimage.yml local_conf_header: trusted_services: | From patchwork Mon Jul 7 18:30:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 66351 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 056F8C83F14 for ; Mon, 7 Jul 2025 18:30:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.522.1751913050483909119 for ; Mon, 07 Jul 2025 11:30:50 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 864551762 for ; Mon, 7 Jul 2025 11:30:37 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 ESMTPA id 8BC583F694 for ; Mon, 7 Jul 2025 11:30:49 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/5] arm/trusted-services: set DEBUG_PREFIX_MAP correctly with UNPACKDIR Date: Mon, 7 Jul 2025 19:30:39 +0100 Message-ID: <20250707183042.1299783-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250707183042.1299783-1-ross.burton@arm.com> References: <20250707183042.1299783-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 ; Mon, 07 Jul 2025 18:30:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6599 The sources are not under WORKDIR/git anymore, use UNPACKDIR. This most likely isn't entirely correct but does remove build paths from the binaries. Also use TARGET_DBGSRC_DIR instead of constructing the target path manually. Signed-off-by: Ross Burton --- .../recipes-security/trusted-services/trusted-services.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/trusted-services.inc b/meta-arm/recipes-security/trusted-services/trusted-services.inc index 2ffc7c90ba..1312b30b80 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services.inc @@ -13,8 +13,8 @@ require trusted-services-src.inc # By default bitbake includes only ${S} (i.e git/trusted-services) in the maps. # We also need to include the TS dependencies source trees. -DEBUG_PREFIX_MAP:append = "-fmacro-prefix-map=${WORKDIR}/git=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ - -fdebug-prefix-map=${WORKDIR}/git=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ +DEBUG_PREFIX_MAP:append = "-fmacro-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR} \ + -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR} \ " TS_PLATFORM ?= "ts/mock" From patchwork Mon Jul 7 18:30:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 66350 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 EBBA9C83F0D for ; Mon, 7 Jul 2025 18:30:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.521.1751913051079891419 for ; Mon, 07 Jul 2025 11:30:51 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 3727C168F for ; Mon, 7 Jul 2025 11:30:38 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 ESMTPA id 3C64C3F694 for ; Mon, 7 Jul 2025 11:30:50 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/5] arm/trusted-services: fix CMAKE_FIND_ROOT_PATH Date: Mon, 7 Jul 2025 19:30:40 +0100 Message-ID: <20250707183042.1299783-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250707183042.1299783-1-ross.burton@arm.com> References: <20250707183042.1299783-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 ; Mon, 07 Jul 2025 18:30:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6600 The sources are not under WORKDIR/git, use UNPACKDIR. Also use B instead of WORKDIR/build in case B changes. Signed-off-by: Ross Burton --- meta-arm/recipes-security/trusted-services/trusted-services.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/trusted-services/trusted-services.inc b/meta-arm/recipes-security/trusted-services/trusted-services.inc index 1312b30b80..1caeeb35b3 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services.inc @@ -28,7 +28,7 @@ SYSROOT_DIRS += "/usr/${TS_ENV} /usr/opteesp /usr/arm-linux" # TS cmake files use find_file() to search through source code and build dirs. # Yocto cmake class limits CMAKE_FIND_ROOT_PATH and find_file() fails. # Include the source tree and build dirs into searchable path. -OECMAKE_EXTRA_ROOT_PATH = "${WORKDIR}/git/ ${WORKDIR}/build/" +OECMAKE_EXTRA_ROOT_PATH = "${UNPACKDIR}/ ${B}" EXTRA_OECMAKE += '-DLIBGCC_LOCATE_CFLAGS="--sysroot=${STAGING_DIR_HOST}" \ -DCROSS_COMPILE="${TARGET_PREFIX}" \ From patchwork Mon Jul 7 18:30:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 66347 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 E61B8C8303C for ; Mon, 7 Jul 2025 18:30:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.522.1751913051887547358 for ; Mon, 07 Jul 2025 11:30:51 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 E9053168F for ; Mon, 7 Jul 2025 11:30:38 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 ESMTPA id E1B2E3F694 for ; Mon, 7 Jul 2025 11:30:50 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/5] arm/trusted-services: use UNPACKDIR instead of WORKDIR/sources/ Date: Mon, 7 Jul 2025 19:30:41 +0100 Message-ID: <20250707183042.1299783-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250707183042.1299783-1-ross.burton@arm.com> References: <20250707183042.1299783-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 ; Mon, 07 Jul 2025 18:30:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6601 Use UNPACKDIR directly instead of constructing it manually from WORKDIR. Signed-off-by: Ross Burton --- .../trusted-services/trusted-services-src.inc | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc index 5a7ab785c2..f557fccf6b 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -56,19 +56,19 @@ inherit apply_local_src_patches LOCAL_SRC_PATCHES_INPUT_DIR = "N/A" do_apply_local_src_patches() { - apply_local_src_patches ${S}/external/qcbor ${WORKDIR}/sources/qcbor - apply_local_src_patches ${S}/external/t_cose ${WORKDIR}/sources/tcose - apply_local_src_patches ${S}/external/MbedTLS ${WORKDIR}/sources/mbedtls - apply_local_src_patches ${S}/external/CppUTest ${WORKDIR}/sources/cpputest - apply_local_src_patches ${S}/external/libfdt ${WORKDIR}/sources/dtc - apply_local_src_patches ${S}/external/nanopb ${WORKDIR}/sources/nanopb + apply_local_src_patches ${S}/external/qcbor ${UNPACKDIR}/qcbor + apply_local_src_patches ${S}/external/t_cose ${UNPACKDIR}/tcose + apply_local_src_patches ${S}/external/MbedTLS ${UNPACKDIR}/mbedtls + apply_local_src_patches ${S}/external/CppUTest ${UNPACKDIR}/cpputest + apply_local_src_patches ${S}/external/libfdt ${UNPACKDIR}/dtc + apply_local_src_patches ${S}/external/nanopb ${UNPACKDIR}/nanopb } # Paths to dependencies required by some TS SPs/tools -EXTRA_OECMAKE += "-DDTC_SOURCE_DIR=${WORKDIR}/sources/dtc \ - -DCPPUTEST_SOURCE_DIR=${WORKDIR}/sources/cpputest \ - -DNANOPB_SOURCE_DIR=${WORKDIR}/sources/nanopb \ - -DT_COSE_SOURCE_DIR=${WORKDIR}/sources/tcose \ - -DQCBOR_SOURCE_DIR=${WORKDIR}/sources/qcbor \ - -DMBEDTLS_SOURCE_DIR=${WORKDIR}/sources/mbedtls \ +EXTRA_OECMAKE += "-DDTC_SOURCE_DIR=${UNPACKDIR}/dtc \ + -DCPPUTEST_SOURCE_DIR=${UNPACKDIR}/cpputest \ + -DNANOPB_SOURCE_DIR=${UNPACKDIR}/nanopb \ + -DT_COSE_SOURCE_DIR=${UNPACKDIR}/tcose \ + -DQCBOR_SOURCE_DIR=${UNPACKDIR}/qcbor \ + -DMBEDTLS_SOURCE_DIR=${UNPACKDIR}/mbedtls \ " From patchwork Mon Jul 7 18:30:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 66348 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 DDC98C71130 for ; Mon, 7 Jul 2025 18:30:53 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.523.1751913052309543773 for ; Mon, 07 Jul 2025 11:30:52 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 8463A1762 for ; Mon, 7 Jul 2025 11:30:39 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.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 ESMTPA id 89B3F3F694 for ; Mon, 7 Jul 2025 11:30:51 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/5] arm/ts-psa-iat-api-test: fix path to QCBOR Date: Mon, 7 Jul 2025 19:30:42 +0100 Message-ID: <20250707183042.1299783-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250707183042.1299783-1-ross.burton@arm.com> References: <20250707183042.1299783-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 ; Mon, 07 Jul 2025 18:30:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6602 This recipe has a second copy of QCBOR in SRC_URI, correct the reference to its location in EXTRA_OECMAKE to fix builds with network isolation. Signed-off-by: Ross Burton --- .../trusted-services/ts-psa-iat-api-test_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/ts-psa-iat-api-test_git.bb b/meta-arm/recipes-security/trusted-services/ts-psa-iat-api-test_git.bb index 7deadc0098..4db45cc55c 100644 --- a/meta-arm/recipes-security/trusted-services/ts-psa-iat-api-test_git.bb +++ b/meta-arm/recipes-security/trusted-services/ts-psa-iat-api-test_git.bb @@ -14,8 +14,8 @@ SRC_URI += "git://github.com/laurencelundblade/QCBOR.git;name=psaqcbor;protocol= " SRCREV_psaqcbor = "42272e466a8472948bf8fca076d113b81b99f0e0" -EXTRA_OECMAKE += "-DPSA_TARGET_QCBOR=${WORKDIR}/git/psaqcbor \ - " +EXTRA_OECMAKE += "-DPSA_TARGET_QCBOR=${UNPACKDIR}/psaqcbor" + # TODO: remove FORTIFY_SOURCE as MbedTLS fails to build in yocto if this # compilation flag is used. lcl_maybe_fortify = "${@oe.utils.conditional('OPTLEVEL','-O0','','${OPTLEVEL}',d)}"