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

optee-client: 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 471300ca..aa59daba 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -429,7 +429,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.10.0.imx"
+PREFERRED_VERSION_optee-client:mx8-nxp-bsp ?= "3.15.0.imx"
 PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ?= "3.10.0.imx"
 
 #Use i.MX opencv Version for mx8
diff --git a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
similarity index 69%
rename from recipes-security/optee-imx/optee-client_3.10.0.imx.bb
rename to recipes-security/optee-imx/optee-client_3.15.0.imx.bb
index 2ad55a64..dcfee307 100644
--- a/recipes-security/optee-imx/optee-client_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb
@@ -5,13 +5,13 @@ HOMEPAGE = "http://www.optee.org/"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-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-client.git;protocol=https;branch=${SRCBRANCH} \
     file://tee-supplicant.service \
 "
 
-SRCREV = "2a77cf88d956c34cb4a1c191bea6113e327f5fe0"
+SRCREV = "182874320395787a389e5b0f7df02b32f3c0a1b0"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
@@ -29,13 +29,17 @@ EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}"
 do_install () {
 	oe_runmake -C ${S} install
 
-	install -D -p -m0644 ${B}/export/usr/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0
-	ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
-	ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
+	install -D -p -m0644 ${B}/export/usr/lib/libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0.0
+	ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
+	ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so
+
+	install -D -p -m0644 ${B}/export/usr/lib/libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0.1.0
+	ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so.0
+	ln -sf libckteec.so.0.1.0 ${D}${libdir}/libckteec.so
 
 	install -D -p -m0755 ${B}/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
 
-	cp -a ${B}/export/usr/include ${D}/usr/
+	cp -a ${B}/export/usr/include ${D}${includedir}
 
 	sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${WORKDIR}/tee-supplicant.service
 	install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service