[PATCH] arm/trusted-services: enable devtool modify for ts-psa-api-test

From: Arthur Cassegrain <[email protected]>

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 <[email protected]>
---
 .../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-te=
st.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.i=
nc
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 :=3D "${THISDIR}/cor=
stone1000/psa-apitest:"
 include ts-arm-platforms.inc
=20
 SRC_URI:append:corstone1000  =3D " \
-    file://0001-corstone1000-port-crypto-config.patch;patchdir=3D../psat=
est \
-    file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=3D=
../psatest \
-    file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=3D../psat=
est \
-    file://0004-Remove-RSA-support.patch;patchdir=3D../psatest \
+    file://0001-corstone1000-port-crypto-config.patch;patchdir=3D../ts/t=
s-external/psatest \
+    file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=3D=
../ts/ts-external/psatest \
+    file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=3D../ts/t=
s-external/psatest \
+    file://0004-Remove-RSA-support.patch;patchdir=3D../ts/ts-external/ps=
atest \
     "
diff --git a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-c=
ommon_git.inc b/meta-arm/recipes-security/trusted-services/ts-psa-api-tes=
t-common_git.inc
index aacd09c3..f0421577 100644
--- a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_g=
it.inc
+++ b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_g=
it.inc
@@ -9,17 +9,17 @@ DEPENDS        +=3D "python3-jsonschema-native python3-=
jinja2-native"
 DEPENDS        +=3D "libpsats"
 RDEPENDS:${PN} +=3D "libpsats"
=20
-SRC_URI +=3D "git://github.com/ARM-software/psa-arch-tests.git;name=3Dps=
atest;protocol=3Dhttps;branch=3Dmain;destsuffix=3Dpsatest \
-            file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-nati=
ve.patch;patchdir=3D../psatest \
+SRC_URI +=3D "git://github.com/ARM-software/psa-arch-tests.git;name=3Dps=
atest;protocol=3Dhttps;branch=3Dmain;destsuffix=3Dts/ts-external/psatest =
\
+            file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-nati=
ve.patch;patchdir=3D../ts/ts-external/psatest \
            "
=20
 SRCREV_psatest =3D "74dc6646ff594e131a726a5305aba77bac30eceb"
-LIC_FILES_CHKSUM +=3D "file://../psatest/LICENSE.md;md5=3D2a944942e1496a=
f1886903d274dedb13"
+LIC_FILES_CHKSUM +=3D "file://${S}/ts-external/psatest/LICENSE.md;md5=3D=
2a944942e1496af1886903d274dedb13"
=20
-EXTRA_OECMAKE +=3D "-DPSA_ARCH_TESTS_SOURCE_DIR=3D${WORKDIR}/sources/psa=
test"
+EXTRA_OECMAKE +=3D "-DPSA_ARCH_TESTS_SOURCE_DIR=3D${S}/ts-external/psate=
st"
=20
 do_apply_local_src_patches:append() {
-    apply_local_src_patches ${S}/external/psa_arch_tests ${WORKDIR}/sour=
ces/psatest
+    apply_local_src_patches ${S}/external/psa_arch_tests ${S}/ts-externa=
l/psatest
 }
=20
 FILES:${PN} =3D "${bindir}/${PSA_TEST}"
--=20
2.43.0