4 files changed, 28 insertions, 92 deletions

diff --git a/recipes-security/optee/optee-client-qoriq.bb b/recipes-security/optee/optee-client-qoriq.bb
deleted file mode 100644
index af5fc095e..000000000
--- a/recipes-security/optee/optee-client-qoriq.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "OPTEE Client"
-HOMEPAGE = "https://github.com/qoriq-open-source/optee_client"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
-
-inherit python3native systemd
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_client;nobranch=1 \
-"
-S = "${WORKDIR}/git"
-
-SRCREV = "08428734c67fb559e420d87fa52fd74a955ea1bd"
-
-EXTRA_OEMAKE = "ARCH=arm64"
-
-do_install() {
-    oe_runmake install
-
-    install -D -p -m0755 ${S}/out/export/bin/tee-supplicant ${D}${bindir}/tee-supplicant
-
-    install -D -p -m0644 ${S}/out/export/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
-
-    cp -a ${S}/out/export/include ${D}/usr/
-}
-
-COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-security/optee/optee-client-qoriq/0001-GCC-8-format-truncation-error.patch b/recipes-security/optee/optee-client-qoriq/0001-GCC-8-format-truncation-error.patch
deleted file mode 100644
index f58590c3d..000000000
--- a/recipes-security/optee/optee-client-qoriq/0001-GCC-8-format-truncation-error.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 05f741c1e6263bec2977901abe61463b7f8175ad Mon Sep 17 00:00:00 2001
-From: Chunrong Guo <chunrong.guo@nxp.com>
-Date: Fri, 22 Jun 2018 11:58:09 +0800
-Subject: [PATCH] GCC 8 format-truncation error
-
-Signed-off-by: BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
----
- libteec/src/teec_trace.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libteec/src/teec_trace.c b/libteec/src/teec_trace.c
-index 78b79d6..7901deb 100644
---- a/libteec/src/teec_trace.c
-+++ b/libteec/src/teec_trace.c
-@@ -73,7 +73,7 @@ int _dprintf(const char *function, int flen, int line, int level,
-             const char *prefix, const char *fmt, ...)
- {
-        char raw[MAX_PRINT_SIZE];
--       char prefixed[MAX_PRINT_SIZE];
-+       char prefixed[MAX_PRINT_SIZE + 10];
-        char *to_print = NULL;
-        const char *func;
-        int err;
-@@ -106,7 +106,7 @@ int _dprintf(const char *function, int flen, int line, int level,
-                 */
-                int thread_id = syscall(SYS_gettid);    /* perf issue ? */
- 
--               snprintf(prefixed, MAX_PRINT_SIZE,
-+               snprintf(prefixed, MAX_PRINT_SIZE + 10,
-                         "%s [%d] %s:%s:%d: %s",
-                         trace_level_strings[level], thread_id, prefix, func,
-                         line, raw);
--- 
-1.8.3.1
-
diff --git a/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch b/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch
deleted file mode 100644
index 09e4490db..000000000
--- a/recipes-security/optee/optee-client-qoriq/0001-flags-CFLAGS-add-Wno-cpp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f2ebda1d85b10fd008c21974a0f7aa4e805d0e5c Mon Sep 17 00:00:00 2001
-From: Chunrong Guo <chunrong.guo@nxp.com>
-Date: Tue, 11 Sep 2018 11:40:55 +0800
-Subject: [PATCH] flags: CFLAGS add -Wno-cpp
-
-*fix build with FORTIFY_SOURCES
-
-Signed-off-by: BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com>
----
- flags.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/flags.mk b/flags.mk
-index 71f3d18..43c18f0 100644
---- a/flags.mk
-+++ b/flags.mk
-@@ -14,7 +14,7 @@ CFLAGS          := -Wall -Wbad-function-cast -Wcast-align \
-                   -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs \
-                   -Wpointer-arith -Wshadow -Wstrict-prototypes \
-                   -Wswitch-default -Wunsafe-loop-optimizations \
--                  -Wwrite-strings -Werror
-+                  -Wwrite-strings -Werror -Wno-cpp
- CFLAGS          += -c -fPIC
- 
- DEBUG       ?= 0
--- 
-2.7.4
-
diff --git a/recipes-security/optee/optee-client-qoriq_3.8.0.bb b/recipes-security/optee/optee-client-qoriq_3.8.0.bb
new file mode 100644
index 000000000..0cd9eeabf
--- /dev/null
+++ b/recipes-security/optee/optee-client-qoriq_3.8.0.bb
@@ -0,0 +1,28 @@
+SUMMARY = "OPTEE Client"
+HOMEPAGE = "https://github.com/OP-TEE/optee_client"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+
+inherit python3native systemd
+
+SRC_URI = "git://github.com/OP-TEE/optee_client;nobranch=1"
+SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = "ARCH=arm64"
+
+do_install() {
+    oe_runmake install
+
+    install -D -p -m0755 ${S}/out/export/usr/sbin/tee-supplicant ${D}${bindir}/tee-supplicant
+    install -D -p -m0755 ${S}/out/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.0
+    ln -sf libteec.so.1.0.0 ${D}${libdir}/libteec.so.1
+    ln -sf libteec.so.1 ${D}${libdir}/libteec.so
+
+    cp -a ${S}/out/export/usr/include ${D}/usr/
+}
+
+COMPATIBLE_MACHINE = "(qoriq-arm64)"