package/optee-client: bump to version 3.18.0

Bumps OP-TEE Client package version to OP-TEE release 3.18.0.
Removes patch that has been merged between OP-TEE tags 3.17.0 and 3.18.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Etienne Carriere 2022-07-22 10:53:45 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent eb284ba92c
commit f6b291499e
3 changed files with 3 additions and 42 deletions

View File

@ -1,39 +0,0 @@
From f2a7c942393c6383ac89d9264999cd9c93a70b80 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 14 May 2022 19:33:57 +0200
Subject: [PATCH] tee-supplicant/src/tee_supplicant.c: fix build without
plugins
Fix the following build failure with CFG_TEE_SUPP_PLUGINS != y raised
since version 3.17.0 and commit [1].
/home/giuliobenetti/autobuild/run/instance-2/output-1/build/optee-client-3.17.0/tee-supplicant/src/tee_supplicant.c:104:22: error: 'TEE_PLUGIN_LOAD_PATH' undeclared here (not in a function); did you mean 'TEEC_LOAD_PATH'?
104 | .plugin_load_path = TEE_PLUGIN_LOAD_PATH,
| ^~~~~~~~~~~~~~~~~~~~
| TEEC_LOAD_PATH
Link: [1] https://github.com/OP-TEE/optee_client/commit/876b1ae719e12890ddd96e85cd4e9862dab46448
Fixes: http://autobuild.buildroot.org/results/384e0ca894dbc0ec72cea76141de890f1ce484db
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/OP-TEE/optee_client/commit/f2a7c942393c6383ac89d9264999cd9c93a70b80]
---
tee-supplicant/src/tee_supplicant.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tee-supplicant/src/tee_supplicant.c b/tee-supplicant/src/tee_supplicant.c
index 7b186ed9..53c29a26 100644
--- a/tee-supplicant/src/tee_supplicant.c
+++ b/tee-supplicant/src/tee_supplicant.c
@@ -101,7 +101,9 @@ static struct tee_shm *shm_head;
struct tee_supplicant_params supplicant_params = {
.ta_dir = "optee_armtz",
+#ifdef TEE_PLUGIN_LOAD_PATH
.plugin_load_path = TEE_PLUGIN_LOAD_PATH,
+#endif
.fs_parent_path = TEE_FS_PARENT_PATH,
};

View File

@ -1,4 +1,4 @@
# From https://github.com/OP-TEE/optee_client/archive/3.17.0/optee-client-3.17.0.tar.gz
sha256 bf62ceaac59e8a650abf7632e702b5929335f4974f3173f8c51900cb0f91660f optee-client-3.17.0.tar.gz
# From https://github.com/OP-TEE/optee_client/archive/3.18.0/optee-client-3.18.0.tar.gz
sha256 ecc0f04fdd5398aa52fea50427fbd624f7f90274aec7bbf2cc8a5bd16758202b optee-client-3.18.0.tar.gz
# Locally computed
sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE

View File

@ -4,7 +4,7 @@
#
################################################################################
OPTEE_CLIENT_VERSION = 3.17.0
OPTEE_CLIENT_VERSION = 3.18.0
OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
OPTEE_CLIENT_LICENSE = BSD-2-Clause
OPTEE_CLIENT_LICENSE_FILES = LICENSE