optee-client-qoriq: Upgrade 3.13.0 -> 4.6.0

Update from LF6.12.20-2.0.0

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>

4 files changed, 18 insertions, 60 deletions

diff --git a/recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb b/recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb
deleted file mode 100644
index 94123e435..000000000
--- a/recipes-security/optee-qoriq/optee-client-qoriq_3.13.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require optee-client.nxp.inc
-
-PV:append = "+git${SRCPV}"
-
-COMPATIBLE_MACHINE = "(qoriq-arm64)"
diff --git a/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb b/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb
new file mode 100644
index 000000000..4b61f7c04
--- /dev/null
+++ b/recipes-security/optee-qoriq/optee-client-qoriq_4.6.0.bb
@@ -0,0 +1,4 @@
+require optee-client.nxp.inc
+
+OPTEE_CLIENT_BRANCH = "lf-6.12.20_2.0.0"
+SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/recipes-security/optee-qoriq/optee-client.nxp.inc b/recipes-security/optee-qoriq/optee-client.nxp.inc
index a7e51a29d..590540cd8 100644
--- a/recipes-security/optee-qoriq/optee-client.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-client.nxp.inc
@@ -1,52 +1,22 @@
-# Copyright 2020-2021 NXP
+# Copyright 2020-2021,2025 NXP
 
-SUMMARY = "OPTEE Client libs"
-HOMEPAGE = "http://www.optee.org/"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+require recipes-security/optee-imx/optee-client-fslc.inc
 
-inherit python3native systemd
+# The patch same as imx-optee, so point FILESEXTRAPATHS to optee-imx/optee-client,
+# avoid duplicate copy files to optee-qoriq
+FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-client:"
 
-SRC_URI = "git://github.com/nxp-qoriq/optee_client.git;protocol=https;nobranch=1"
-SRCREV = "7c9c423d00e96bf51debd5fe10fd70dce83be5cc"
+DEPENDS = "util-linux-libuuid"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:"
-SRC_URI += "file://tee-supplicant.service"
+SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https"
+SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${OPTEE_CLIENT_BRANCH} "
 
-B = "${WORKDIR}/build"
+OPTEE_CLIENT_SRC ?= "git://github.com/nxp-qoriq/optee_client.git;protocol=https"
 
-OPTEE_ARCH ?= "arm32"
-OPTEE_ARCH:armv7a = "arm32"
-OPTEE_ARCH:aarch64 = "arm64"
+inherit pkgconfig
 
-EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}"
-
-do_install () {
-        oe_runmake -C ${S} install
-
-        install -d ${D}${libdir}/
-        install -p -m0644 ${B}/export${libdir}/libteec.so.1.0.0 ${D}${libdir}/
-        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1.0
-        ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
-        ln -sf libteec.so.1 ${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.1
-        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}${includedir}
-
-        install -d ${D}${systemd_system_unitdir}/
-        install -m0644 ${UNPACKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/
-        sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${D}${systemd_system_unitdir}/tee-supplicant.service
+do_install:append () {
+    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        rm -rf ${D}${libdir}/systemd
+    fi
 }
-
-SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
-
-FILES:${PN} += "${libdir}/* ${includedir}/*"
-
-INSANE_SKIP:${PN} = "ldflags dev-elf"
-INSANE_SKIP:${PN}-dev = "ldflags dev-elf"
diff --git a/recipes-security/optee-qoriq/optee-client/tee-supplicant.service b/recipes-security/optee-qoriq/optee-client/tee-supplicant.service
deleted file mode 100644
index 0e2b4f6ba..000000000
--- a/recipes-security/optee-qoriq/optee-client/tee-supplicant.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=TEE Supplicant
-
-[Service]
-User=root
-EnvironmentFile=-/etc/default/tee-supplicant
-ExecStart=/usr/bin/tee-supplicant $OPTARGS
-
-[Install]
-WantedBy=basic.target
-