From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 16 Feb 2022 17:54:36 +0000 (-0600)
Subject: optee-test: Upgrade 3.10.0.imx -> 3.15.0.imx
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9e67b70994ac094d36b05050cf68552fa5396803;p=meta-freescale.git

optee-test: Upgrade 3.10.0.imx -> 3.15.0.imx

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index aa59daba..fff3c56d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -430,7 +430,7 @@ PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx"
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ?= "3.15.0.imx"
 PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.15.0.imx"
-PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.10.0.imx"
+PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.15.0.imx"
 
 #Use i.MX opencv Version for mx8
 PREFERRED_VERSION_opencv:mx8-nxp-bsp ?= "4.5.2.imx"
diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb
similarity index 82%
rename from recipes-security/optee-imx/optee-test_3.10.0.imx.bb
rename to recipes-security/optee-imx/optee-test_3.15.0.imx.bb
index 53951787..7eb11a84 100644
--- a/recipes-security/optee-imx/optee-test_3.10.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 = "imx_5.4.70_2.3.0"
+SRCBRANCH = "lf-5.10.72_2.2.0"
 
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
-SRCREV = "0c998f42a3fb87b9f2929955cf4b0116cc515091"
+SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9"
 
 inherit python3native
 
@@ -45,6 +45,7 @@ do_compile() {
     # Top level makefile doesn't seem to handle parallel make gracefully
     oe_runmake xtest
     oe_runmake ta
+    oe_runmake test_plugin
 }
 do_compile[cleandirs] = "${B}"
 
@@ -56,8 +57,11 @@ do_install () {
 	find ${B}/ta -name '*.ta' | while read name; do
 		install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
 	done
+
+	install -d ${D}${libdir}/tee-supplicant/plugins/
+	install ${B}/supp_plugin/*plugin ${D}${libdir}/tee-supplicant/plugins/
 }
 
-FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ ${libdir}/tee-supplicant/plugins/"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"