optee-test: Upgrade to NXP 5.15.5-1.0.0

- Fix hard-coded /usr with exec_prefix variable
- Parallel make works, remove work around

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit a11a0895a4b16ba5ae31693feff379e3de646045)

1 files changed, 4 insertions, 8 deletions

diff --git a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
index 1d6de243..a44454a7 100644
--- a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl"
 
-SRCBRANCH = "lf-5.10.72_2.2.0"
+SRCBRANCH = "lf-5.15.5_1.0.0"
 
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
-SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9"
+SRCREV = "e9d8bf6ee121d6686e6e409c727caee76496bb86"
 
 inherit python3native features_check
 
@@ -34,7 +34,7 @@ CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
 EXTRA_OEMAKE = " \
     TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
     ARCH=${OPTEE_ARCH} \
-    OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}/usr \
+    OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \
     CROSS_COMPILE_HOST=${HOST_PREFIX} \
     CROSS_COMPILE_TA=${HOST_PREFIX} \
     CROSS_COMPILE=${HOST_PREFIX} \
@@ -42,11 +42,7 @@ EXTRA_OEMAKE = " \
 "
 
 do_compile() {
-    cd ${S}
-    # Top level makefile doesn't seem to handle parallel make gracefully
-    oe_runmake xtest
-    oe_runmake ta
-    oe_runmake test_plugin
+    oe_runmake all
 }
 do_compile[cleandirs] = "${B}"