Re: [ptxdist] [APPLIED] optee-client: switch to cmake

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as a06d32d59aa54147c6dd2316ce2af5ff587c5f0e.

Michael

[sent from post-receive hook]

On Sat, 05 Jul 2025 10:22:19 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250626150657.2728049-2-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/optee-client.in b/rules/optee-client.in
> index d1acb6be5f8c..5d05d3bf5ebf 100644
> --- a/rules/optee-client.in
> +++ b/rules/optee-client.in
> @@ -2,6 +2,7 @@
>  
>  menuconfig OPTEE_CLIENT
>  	tristate
> +	select HOST_CMAKE
>  	select LIBUUID
>  	prompt "optee-client                  "
>  	help
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index 698b60da8546..6c6a5f5b1cb8 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -27,13 +27,27 @@ OPTEE_CLIENT_LICENSE	:= BSD-2-Clause
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -OPTEE_CLIENT_CONF_TOOL := NO
> -OPTEE_CLIENT_MAKE_ENV := \
> -	$(CROSS_ENV) \
> -	LIBDIR=/usr/lib \
> -	INCLUDEDIR=/usr/include \
> -	CFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ \
> -	CFG_TEE_SUPP_PLUGINS=n
> +OPTEE_CLIENT_CONF_TOOL	:= cmake
> +OPTEE_CLIENT_CONF_OPT	:= \
> +	$(CROSS_CMAKE_USR) \
> +	-DBUILD_SHARED_LIBS=ON \
> +	-DCFG_FTRACE_SUPPORT=ON \
> +	-DCFG_GP_SOCKETS=1 \
> +	-DCFG_TA_GPROF_SUPPORT=ON \
> +	-DCFG_TEEPRIV_GROUP=teepriv \
> +	-DCFG_TEE_CLIENT_LOAD_PATH=/usr/lib/ \
> +	-DCFG_TEE_CLIENT_LOG_FILE=var/lib/tee/teec.log \
> +	-DCFG_TEE_CLIENT_LOG_LEVEL=1 \
> +	-DCFG_TEE_FS_PARENT_PATH=var/lib/tee \
> +	-DCFG_TEE_GROUP=tee \
> +	-DCFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins/ \
> +	-DCFG_TEE_SUPPL_GROUP=teesuppl \
> +	-DCFG_TEE_SUPPL_USER=teesuppl \
> +	-DCFG_TEE_SUPP_LOG_LEVEL=1 \
> +	-DCFG_TEE_SUPP_PLUGINS=OFF \
> +	-DCFG_WERROR=ON \
> +	-DRPMB_EMU=ON \
> +	-DWITH_TEEACL=ON
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install