From 5b1cce6b7020b954db045009b4956b7f71349bb2 Mon Sep 17 00:00:00 2001
From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Date: Mon, 1 May 2023 18:34:20 +0300
Subject: optee: restructure optee-client recipe

Add include files for optee-client.

The include files feature requirements that are specific to
optee/optee-client projects and i.MX platforms.

The recipe file with version number features the git branch and
commit hash.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
 .../optee-imx/optee-client-fslc-imx.inc            |  7 ++++
 recipes-security/optee-imx/optee-client-fslc.inc   | 42 ++++++++++++++++++++
 .../optee-imx/optee-client_3.19.0.imx.bb           | 46 +---------------------
 3 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 recipes-security/optee-imx/optee-client-fslc-imx.inc
 create mode 100644 recipes-security/optee-imx/optee-client-fslc.inc

diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc
new file mode 100644
index 00000000..4cfe18bf
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc
@@ -0,0 +1,7 @@
+# Copyright (C) 2017-2021 NXP
+
+require optee-client-fslc.inc
+
+SRC_URI += "git://github.com/nxp-imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}"
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
new file mode 100644
index 00000000..92f9f1d1
--- /dev/null
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -0,0 +1,42 @@
+# Copyright (C) 2017-2021 NXP
+
+SUMMARY = "OPTEE Client libs"
+HOMEPAGE = "http://www.optee.org/"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+
+SRC_URI = "file://tee-supplicant.service"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+inherit python3native systemd features_check pkgconfig
+
+DEPENDS = "util-linux-libuuid"
+
+REQUIRED_MACHINE_FEATURES = "optee"
+
+SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
+
+EXTRA_OEMAKE = " \
+	-C ${S} O=${B} \
+"
+
+do_install () {
+	oe_runmake -C ${S} install
+
+	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}${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
+}
diff --git a/recipes-security/optee-imx/optee-client_3.19.0.imx.bb b/recipes-security/optee-imx/optee-client_3.19.0.imx.bb
index b0fb9178..40675e35 100644
--- a/recipes-security/optee-imx/optee-client_3.19.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_3.19.0.imx.bb
@@ -1,48 +1,4 @@
-# Copyright (C) 2017-2021 NXP
+require optee-client-fslc-imx.inc
 
-SUMMARY = "OPTEE Client libs"
-HOMEPAGE = "http://www.optee.org/"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
-
-SRC_URI = " \
-    git://github.com/nxp-imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH} \
-    file://tee-supplicant.service"
 SRCBRANCH = "lf-5.15.71_2.2.0"
 SRCREV = "644022f8970c832a40be00747fcec70c7b5d488c"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit python3native systemd features_check pkgconfig
-
-DEPENDS = "util-linux-libuuid"
-
-REQUIRED_MACHINE_FEATURES = "optee"
-
-SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
-
-EXTRA_OEMAKE = " \
-	-C ${S} O=${B} \
-"
-
-do_install () {
-	oe_runmake -C ${S} install
-
-	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}${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
-}
-
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
-- 
cgit v1.2.3-54-g00ecf