From 63363e13bf55c03d97feb00beb8a848d02560358 Mon Sep 17 00:00:00 2001
From: Peter Griffin <peter.griffin@linaro.org>
Date: Wed, 7 Nov 2018 15:58:27 +0000
Subject: optee-client.bb: update to optee v3.3.0

xtest summary

16085 subtests of which 3 failed
75 test cases of which 1 failed
0 test case was skipped

3 failing tests are regression_1014.1, regression_1014.2
and regression_1014.3 due to ION not being enabled.

Change-Id: I06fa9a22c37564f8e31cf0f54f642b94516d846e
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 meta-optee/recipes-security/optee/optee-client.bb  |  5 +-
 .../0001-Respect-LDFLAGS-set-from-OE-build.patch   | 67 ----------------------
 2 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 meta-optee/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch

diff --git a/meta-optee/recipes-security/optee/optee-client.bb b/meta-optee/recipes-security/optee/optee-client.bb
index d0773c93..377b9a69 100644
--- a/meta-optee/recipes-security/optee/optee-client.bb
+++ b/meta-optee/recipes-security/optee/optee-client.bb
@@ -4,16 +4,15 @@ HOMEPAGE = "https://github.com/OP-TEE/optee_client"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-PV = "2.6.0+git${SRCPV}"
+PV = "3.3.0+git${SRCPV}"
 
 inherit pythonnative systemd
 
 SRC_URI = "git://github.com/OP-TEE/optee_client.git \
-           file://0001-Respect-LDFLAGS-set-from-OE-build.patch \
            file://tee-supplicant.service"
 S = "${WORKDIR}/git"
 
-SRCREV = "73b4e490a8ed0b4a7714818e80998b9d8a7da958"
+SRCREV = "c48bc3be9f23529952c7dd80ddd775bf580315b8"
 
 SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
 
diff --git a/meta-optee/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch b/meta-optee/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch
deleted file mode 100644
index 8dd6c7a9..00000000
--- a/meta-optee/recipes-security/optee/optee-client/0001-Respect-LDFLAGS-set-from-OE-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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
-
-- 
cgit v1.2.3