From 8df56513d9b73ddb560e362988333bc065146a91 Mon Sep 17 00:00:00 2001 From: Arthur Cassegrain Date: Wed, 17 Jun 2026 14:23:29 +0200 Subject: [PATCH] arm/trusted-services: enable devtool modify for ts-psa-api-test Place psa-arch-tests under ${S}/ts-external/psatest and update the recipe paths to match. This keeps the external source layout aligned with trusted-services, updates the Corstone-1000 patch locations, and lets devtool modify work against the same psa-arch-tests tree that CMake and apply_local_src_patches use. Signed-off-by: Arthur Cassegrain Signed-off-by: Jon Mason --- .../trusted-services/ts-psa-api-test.inc | 8 ++++---- .../trusted-services/ts-psa-api-test-common_git.inc | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc index 006bcdef..70bd8621 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc @@ -3,8 +3,8 @@ FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000/psa-apitest:" include ts-arm-platforms.inc SRC_URI:append:corstone1000 = " \ - file://0001-corstone1000-port-crypto-config.patch;patchdir=../psatest \ - file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=../psatest \ - file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=../psatest \ - file://0004-Remove-RSA-support.patch;patchdir=../psatest \ + file://0001-corstone1000-port-crypto-config.patch;patchdir=../ts/ts-external/psatest \ + file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=../ts/ts-external/psatest \ + file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=../ts/ts-external/psatest \ + file://0004-Remove-RSA-support.patch;patchdir=../ts/ts-external/psatest \ " diff --git a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc index aacd09c3..f0421577 100644 --- a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc +++ b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc @@ -9,17 +9,17 @@ DEPENDS += "python3-jsonschema-native python3-jinja2-native" DEPENDS += "libpsats" RDEPENDS:${PN} += "libpsats" -SRC_URI += "git://github.com/ARM-software/psa-arch-tests.git;name=psatest;protocol=https;branch=main;destsuffix=psatest \ - file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-native.patch;patchdir=../psatest \ +SRC_URI += "git://github.com/ARM-software/psa-arch-tests.git;name=psatest;protocol=https;branch=main;destsuffix=ts/ts-external/psatest \ + file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-native.patch;patchdir=../ts/ts-external/psatest \ " SRCREV_psatest = "74dc6646ff594e131a726a5305aba77bac30eceb" -LIC_FILES_CHKSUM += "file://../psatest/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" +LIC_FILES_CHKSUM += "file://${S}/ts-external/psatest/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" -EXTRA_OECMAKE += "-DPSA_ARCH_TESTS_SOURCE_DIR=${WORKDIR}/sources/psatest" +EXTRA_OECMAKE += "-DPSA_ARCH_TESTS_SOURCE_DIR=${S}/ts-external/psatest" do_apply_local_src_patches:append() { - apply_local_src_patches ${S}/external/psa_arch_tests ${WORKDIR}/sources/psatest + apply_local_src_patches ${S}/external/psa_arch_tests ${S}/ts-external/psatest } FILES:${PN} = "${bindir}/${PSA_TEST}"