2 files changed, 93 insertions, 0 deletions

diff --git a/recipes-security/optee/optee-client.bb b/recipes-security/optee/optee-client.bb
new file mode 100644
index 000000000..b811e600a
--- /dev/null
+++ b/recipes-security/optee/optee-client.bb
@@ -0,0 +1,26 @@
+SUMMARY = "OPTEE Client"
+HOMEPAGE = "https://github.com/qoriq-open-source/optee_client"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
+
+inherit pythonnative systemd
+
+SRC_URI = "git://github.com/qoriq-open-source/optee_client.git;nobranch=1 \
+           file://0001-Respect-LDFLAGS-set-from-OE-build.patch \
+"
+S = "${WORKDIR}/git"
+
+SRCREV = "73b4e490a8ed0b4a7714818e80998b9d8a7da958"
+
+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/
+}
diff --git a/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch b/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch
new file mode 100644
index 000000000..8dd6c7a94
--- /dev/null
+++ b/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch
@@ -0,0 +1,67 @@
+From 73cb675c16bd63ee0e760a4067ffda4b050d19fa Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 15 Jun 2017 17:20:35 -0700
+Subject: [PATCH] Respect LDFLAGS set from OE build
+
+* Unify LFLAGS/LDFLAGS variable names (only tee-supplicant was using LDFLAGS).
+* Fixes:
+  ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: 'optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/packages-split/optee-client/usr/bin/tee-supplicant'
+  No GNU_HASH in the elf binary: 'optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/packages-split/optee-client/usr/lib/libteec.so.1.0' [ldflags]
+  ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.
+  ERROR: optee-client-2.4.0+gitAUTOINC+1df4046bd7-r0 do_package_qa: Function failed: do_package_qa
+  ERROR: Logfile of failure stored in: optee-client/2.4.0+gitAUTOINC+1df4046bd7-r0/temp/log.do_package_qa.31246
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+---
+ libteec/Makefile        | 2 +-
+ tee-supplicant/Makefile | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libteec/Makefile b/libteec/Makefile
+index 568a2cd..a406237 100644
+--- a/libteec/Makefile
++++ b/libteec/Makefile
+@@ -36,7 +36,7 @@ ifeq ($(CFG_TEE_BENCHMARK),y)
+ TEEC_CFLAGS    += -DCFG_TEE_BENCHMARK
+ endif
+ 
+-TEEC_LFLAGS    := -lpthread
++TEEC_LFLAGS    := $(LDFLAGS) -lpthread
+ TEEC_LIBRARY   := $(OUT_DIR)/$(LIB_MAJ_MIN)
+ 
+ libteec: $(TEEC_LIBRARY)
+diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile
+index 737d39a..4b423fb 100644
+--- a/tee-supplicant/Makefile
++++ b/tee-supplicant/Makefile
+@@ -55,21 +55,21 @@ ifeq ($(CFG_TA_TEST_PATH),y)
+ TEES_CFLAGS    += -DCFG_TA_TEST_PATH=1
+ endif
+ TEES_FILE      := $(OUT_DIR)/$(PACKAGE_NAME)
+-TEES_LDFLAGS    := -L$(OUT_DIR)/../libteec -lteec
++TEES_LFLAGS    := $(LDFLAGS) -L$(OUT_DIR)/../libteec -lteec
+ 
+ ifeq ($(CFG_TA_GPROF_SUPPORT),y)
+ TEES_CFLAGS    += -DCFG_TA_GPROF_SUPPORT
+ endif
+ 
+-TEES_LDFLAGS   += -lpthread
++TEES_LFLAGS    += -lpthread
+ # Needed to get clock_gettime() for for glibc versions before 2.17
+-TEES_LDFLAGS   += -lrt
++TEES_LFLAGS    += -lrt
+ 
+ tee-supplicant: $(TEES_FILE)
+ 
+ $(TEES_FILE): $(TEES_OBJS)
+        @echo "  LINK    $@"
+-       $(VPREFIX)$(CC) -o $@ $+ $(TEES_LDFLAGS)
++       $(VPREFIX)$(CC) -o $@ $+ $(TEES_LFLAGS)
+        @echo ""
+ 
+ $(TEES_OBJ_DIR)/%.o: $(TEES_SRC_DIR)/%.c
+-- 
+2.15.0.rc2
+