[ptxdist] [PATCH] optee-client: version bump 2.4.0 -> 3.1.0 and switch to cmake

[ptxdist] [PATCH] optee-client: version bump 2.4.0 -> 3.1.0 and switch to cmake

[Rouven Czerwinski]

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
---
 rules/optee-client.in   |  1 +
 rules/optee-client.make | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rules/optee-client.in b/rules/optee-client.in
index 9099b4c48..1349fb21d 100644
--- a/rules/optee-client.in
+++ b/rules/optee-client.in
@@ -3,6 +3,7 @@
 config OPTEE_CLIENT
 	tristate
 	prompt "optee-client"
+	select HOST_CMAKE
 	help
 	  Open Portable Trusted Execution Environment Client API.
 
diff --git a/rules/optee-client.make b/rules/optee-client.make
index 8726f7733..d58600220 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
 #
 # Paths and names
 #
-OPTEE_CLIENT_VERSION	:= 2.4.0
-OPTEE_CLIENT_MD5	:= 5c27298b0e28aa9b28d18e44c79cc66d
+OPTEE_CLIENT_VERSION	:= 3.1.0
+OPTEE_CLIENT_MD5	:= 9dba16bf82e3964834b1a29e6ba54f15
 OPTEE_CLIENT		:= optee-client-$(OPTEE_CLIENT_VERSION)
 OPTEE_CLIENT_SUFFIX	:= tar.gz
 OPTEE_CLIENT_URL	:= https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX)
@@ -29,12 +29,10 @@ OPTEE_CLIENT_LICENSE	:= BSD-2-Clause
 # Prepare
 # ----------------------------------------------------------------------------
 
-OPTEE_CLIENT_CONF_TOOL := NO
-OPTEE_CLIENT_MAKE_ENV := \
-	$(CROSS_ENV) \
-	LIBDIR=/usr/lib \
-	BINDIR=/usr/bin \
-	INCLUDEDIR=/usr/include
+OPTEE_CLIENT_CONF_TOOL := cmake
+OPTEE_CLIENT_CONF_OPT := \
+	$(CROSS_CMAKE_USR) \
+	-DCMAKE_INSTALL_PREFIX=/usr/
 
 ifdef PTXDIST_ICECC
 OPTEE_CLIENT_CFLAGS := -C
-- 
2.17.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] optee-client: version bump 2.4.0 -> 3.1.0 and switch to cmake

[Rouven Czerwinski]

Rouven Czerwinski <rouven@czerwinskis.de> writes:

> Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
> [...]

install still fails, will send a v2

- Rouven

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de