[ptxdist] [PATCH 1/7] optee: version bump 4.5.0 -> 4.6.0

[ptxdist] [PATCH 1/7] optee: version bump 4.5.0 -> 4.6.0

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-client.make   | 4 ++--
 rules/optee-examples.make | 4 ++--
 rules/optee-test.make     | 4 ++--
 rules/optee.make          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rules/optee-client.make b/rules/optee-client.make
index 2067ba0e96c3..698b60da8546 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
 #
 # Paths and names
 #
-OPTEE_CLIENT_VERSION	:= 4.4.0
-OPTEE_CLIENT_MD5	:= f5cf4ded21bc68b69037f656257e62bf
+OPTEE_CLIENT_VERSION	:= 4.6.0
+OPTEE_CLIENT_MD5	:= fd4e607cc2c185c9aac0d74c337eab21
 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)
diff --git a/rules/optee-examples.make b/rules/optee-examples.make
index a6c1142f9233..376815f938ec 100644
--- a/rules/optee-examples.make
+++ b/rules/optee-examples.make
@@ -16,8 +16,8 @@ endif
 #
 # Paths and names
 #
-OPTEE_EXAMPLES_VERSION	:= 4.4.0
-OPTEE_EXAMPLES_MD5	:= 8ed54bbcb99eb1489540b792d21a973e
+OPTEE_EXAMPLES_VERSION	:= 4.6.0
+OPTEE_EXAMPLES_MD5	:= 24def25f5efa8999f40077a8383167e6
 OPTEE_EXAMPLES		:= optee-examples-$(OPTEE_EXAMPLES_VERSION)
 OPTEE_EXAMPLES_SUFFIX	:= tar.gz
 OPTEE_EXAMPLES_URL	:= https://github.com/linaro-swg/optee_examples/archive/$(OPTEE_EXAMPLES_VERSION).$(OPTEE_EXAMPLES_SUFFIX)
diff --git a/rules/optee-test.make b/rules/optee-test.make
index f904133512c5..83b149461afd 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -16,8 +16,8 @@ endif
 #
 # Paths and names
 #
-OPTEE_TEST_VERSION	:= 4.4.0
-OPTEE_TEST_MD5		:= bd0737097ac7c8ba3c27408736b82a03
+OPTEE_TEST_VERSION	:= 4.6.0
+OPTEE_TEST_MD5		:= 88b4ae2a4e4e1ccd064a06bbe399ed5e
 OPTEE_TEST		:= optee-test-$(OPTEE_TEST_VERSION)
 OPTEE_TEST_SUFFIX	:= tar.gz
 OPTEE_TEST_URL		:= https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
diff --git a/rules/optee.make b/rules/optee.make
index 8ddff64ecb30..6d0fbb03345f 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -16,8 +16,8 @@ endif
 #
 # Paths and names
 #
-OPTEE_VERSION	:= 4.4.0
-OPTEE_MD5	:= 75ee68c7968832fef638932dae666539
+OPTEE_VERSION	:= 4.6.0
+OPTEE_MD5	:= aa77c03cf9927e65edd141b6847c88ec
 OPTEE		:= optee-$(OPTEE_VERSION)
 OPTEE_SUFFIX	:= tar.gz
 OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
-- 
2.39.5

[ptxdist] [PATCH 2/7] optee-client: switch to cmake

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-client.in   |  1 +
 rules/optee-client.make | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

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
-- 
2.39.5

[ptxdist] [PATCH 3/7] optee-client: set OPTEE_CLIENT_LICENSE_FILES

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-client.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/optee-client.make b/rules/optee-client.make
index 6c6a5f5b1cb8..ef07b2ca8fb8 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -22,6 +22,8 @@ OPTEE_CLIENT_URL	:= https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIEN
 OPTEE_CLIENT_SOURCE	:= $(SRCDIR)/$(OPTEE_CLIENT).$(OPTEE_CLIENT_SUFFIX)
 OPTEE_CLIENT_DIR	:= $(BUILDDIR)/$(OPTEE_CLIENT)
 OPTEE_CLIENT_LICENSE	:= BSD-2-Clause
+OPTEE_CLIENT_LICENSE_FILES := \
+	file://LICENSE;md5=69663ab153298557a59c67a60a743e5b
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.5

[ptxdist] [PATCH 4/7] optee-client: add option for supplicant plugin support

[Michael Tretter]

Some applications, for example optee-xtest, may use supplicant plugins.

Add an option to enable the supplicant plugin support, if necessary.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-client.in   | 4 ++++
 rules/optee-client.make | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/optee-client.in b/rules/optee-client.in
index 5d05d3bf5ebf..cb1033cb0533 100644
--- a/rules/optee-client.in
+++ b/rules/optee-client.in
@@ -22,4 +22,8 @@ config OPTEE_CLIENT_SYSTEMD_UNIT
 	depends on SYSTEMD
 	prompt "install systemd service file for tee-supplicant"
 
+config OPTEE_CLIENT_SUPPLICANT_PLUGINS
+	bool
+	prompt "enable TEE supplicant plugins"
+
 endif
diff --git a/rules/optee-client.make b/rules/optee-client.make
index ef07b2ca8fb8..8ea127774b0d 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -46,7 +46,7 @@ OPTEE_CLIENT_CONF_OPT	:= \
 	-DCFG_TEE_SUPPL_GROUP=teesuppl \
 	-DCFG_TEE_SUPPL_USER=teesuppl \
 	-DCFG_TEE_SUPP_LOG_LEVEL=1 \
-	-DCFG_TEE_SUPP_PLUGINS=OFF \
+	-DCFG_TEE_SUPP_PLUGINS=$(call ptx/onoff, PTXCONF_OPTEE_CLIENT_SUPPLICANT_PLUGINS) \
 	-DCFG_WERROR=ON \
 	-DRPMB_EMU=ON \
 	-DWITH_TEEACL=ON
-- 
2.39.5

[ptxdist] [PATCH 5/7] optee-test: set libdir and bindir

[Michael Tretter]

optee-test by default sets ${libdir} to /lib and ${bindir} to /bin. As a
workaround, the ptxdist rule adds /usr to ${DESTDIR} to install into
/usr. This doesn't work, if files not be installed into /usr or a path
already contains /usr.

Thus, set libdir and bindir to include /usr and drop /usr from DESTDIR
to install files relative to the root directory.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-test.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/optee-test.make b/rules/optee-test.make
index 83b149461afd..4984c2bed16f 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -36,7 +36,9 @@ OPTEE_TEST_MAKE_ENV	:= \
 	CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) \
 	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
 	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
-	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib
+	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib \
+	bindir=/usr/bin \
+	libdir=/usr/lib
 
 OPTEE_TEST_CFLAGS	:= \
 	-Wno-error=deprecated-declarations
@@ -45,7 +47,7 @@ OPTEE_TEST_CFLAGS	:= \
 # Install
 # ----------------------------------------------------------------------------
 
-OPTEE_TEST_INSTALL_OPT := install DESTDIR=$(OPTEE_TEST_PKGDIR)/usr/
+OPTEE_TEST_INSTALL_OPT := install DESTDIR=$(OPTEE_TEST_PKGDIR)
 
 $(STATEDIR)/optee-test.install:
 	@$(call targetinfo)
-- 
2.39.5

[ptxdist] [PATCH 6/7] optee-test: install tee-supplicant plugins

[Michael Tretter]

The regression_1033 test tests if OP-TEE supports tee supplicant
plugins.

For this test, optee-test has to install the built plugins and requires
plugin support in the tee-supplicant.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-test.in   | 1 +
 rules/optee-test.make | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/rules/optee-test.in b/rules/optee-test.in
index ceb342bea1a6..47859a299520 100644
--- a/rules/optee-test.in
+++ b/rules/optee-test.in
@@ -3,6 +3,7 @@
 config OPTEE_TEST
 	tristate
 	select OPTEE_CLIENT
+	select OPTEE_CLIENT_SUPPLICANT_PLUGINS
 	select OPTEE
 	select OPENSSL
 	prompt "optee-test"
diff --git a/rules/optee-test.make b/rules/optee-test.make
index 4984c2bed16f..dbb04744be71 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -37,6 +37,7 @@ OPTEE_TEST_MAKE_ENV	:= \
 	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
 	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
 	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib \
+	CFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins \
 	bindir=/usr/bin \
 	libdir=/usr/lib
 
@@ -70,6 +71,7 @@ $(STATEDIR)/optee-test.targetinstall:
 
 	@$(call install_copy, optee-test, 0, 0, 0755, -, /usr/bin/optee-xtest)
 	@$(call install_tree, optee-test, 0, 0, -, /usr/lib/optee_armtz)
+	@$(call install_tree, optee-test, 0, 0, -, /usr/lib/tee-supplicant/plugins)
 
 	@$(call install_finish, optee-test)
 
-- 
2.39.5

[ptxdist] [PATCH 7/7] optee-test: set OPTEE_TEST_LICENSE_FILES

[Michael Tretter]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/optee-test.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/optee-test.make b/rules/optee-test.make
index dbb04744be71..2163920b59b4 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -24,6 +24,9 @@ OPTEE_TEST_URL		:= https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VER
 OPTEE_TEST_SOURCE	:= $(SRCDIR)/$(OPTEE_TEST).$(OPTEE_TEST_SUFFIX)
 OPTEE_TEST_DIR		:= $(BUILDDIR)/$(OPTEE_TEST)
 OPTEE_TEST_LICENSE	:= BSD-2-Clause and GPL-2.0
+OPTEE_TEST_LICENSE_FILES	:= \
+	file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
+	file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.39.5

Re: [ptxdist] [APPLIED] optee: version bump 4.5.0 -> 4.6.0

[Michael Olbrich]

Thanks, applied as e71bfde370c0688939e96fde9b69ff572a8ab84c.

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-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index 2067ba0e96c3..698b60da8546 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
>  #
>  # Paths and names
>  #
> -OPTEE_CLIENT_VERSION	:= 4.4.0
> -OPTEE_CLIENT_MD5	:= f5cf4ded21bc68b69037f656257e62bf
> +OPTEE_CLIENT_VERSION	:= 4.6.0
> +OPTEE_CLIENT_MD5	:= fd4e607cc2c185c9aac0d74c337eab21
>  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)
> diff --git a/rules/optee-examples.make b/rules/optee-examples.make
> index a6c1142f9233..376815f938ec 100644
> --- a/rules/optee-examples.make
> +++ b/rules/optee-examples.make
> @@ -16,8 +16,8 @@ endif
>  #
>  # Paths and names
>  #
> -OPTEE_EXAMPLES_VERSION	:= 4.4.0
> -OPTEE_EXAMPLES_MD5	:= 8ed54bbcb99eb1489540b792d21a973e
> +OPTEE_EXAMPLES_VERSION	:= 4.6.0
> +OPTEE_EXAMPLES_MD5	:= 24def25f5efa8999f40077a8383167e6
>  OPTEE_EXAMPLES		:= optee-examples-$(OPTEE_EXAMPLES_VERSION)
>  OPTEE_EXAMPLES_SUFFIX	:= tar.gz
>  OPTEE_EXAMPLES_URL	:= https://github.com/linaro-swg/optee_examples/archive/$(OPTEE_EXAMPLES_VERSION).$(OPTEE_EXAMPLES_SUFFIX)
> diff --git a/rules/optee-test.make b/rules/optee-test.make
> index f904133512c5..83b149461afd 100644
> --- a/rules/optee-test.make
> +++ b/rules/optee-test.make
> @@ -16,8 +16,8 @@ endif
>  #
>  # Paths and names
>  #
> -OPTEE_TEST_VERSION	:= 4.4.0
> -OPTEE_TEST_MD5		:= bd0737097ac7c8ba3c27408736b82a03
> +OPTEE_TEST_VERSION	:= 4.6.0
> +OPTEE_TEST_MD5		:= 88b4ae2a4e4e1ccd064a06bbe399ed5e
>  OPTEE_TEST		:= optee-test-$(OPTEE_TEST_VERSION)
>  OPTEE_TEST_SUFFIX	:= tar.gz
>  OPTEE_TEST_URL		:= https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
> diff --git a/rules/optee.make b/rules/optee.make
> index 8ddff64ecb30..6d0fbb03345f 100644
> --- a/rules/optee.make
> +++ b/rules/optee.make
> @@ -16,8 +16,8 @@ endif
>  #
>  # Paths and names
>  #
> -OPTEE_VERSION	:= 4.4.0
> -OPTEE_MD5	:= 75ee68c7968832fef638932dae666539
> +OPTEE_VERSION	:= 4.6.0
> +OPTEE_MD5	:= aa77c03cf9927e65edd141b6847c88ec
>  OPTEE		:= optee-$(OPTEE_VERSION)
>  OPTEE_SUFFIX	:= tar.gz
>  OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)

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

[Michael Olbrich]

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

Re: [ptxdist] [APPLIED] optee-client: set OPTEE_CLIENT_LICENSE_FILES

[Michael Olbrich]

Thanks, applied as f4f0f10489ae3d6ad6651583489aa18ff206d9f3.

Michael

[sent from post-receive hook]

On Sat, 05 Jul 2025 10:22:20 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250626150657.2728049-3-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index 6c6a5f5b1cb8..ef07b2ca8fb8 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -22,6 +22,8 @@ OPTEE_CLIENT_URL	:= https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIEN
>  OPTEE_CLIENT_SOURCE	:= $(SRCDIR)/$(OPTEE_CLIENT).$(OPTEE_CLIENT_SUFFIX)
>  OPTEE_CLIENT_DIR	:= $(BUILDDIR)/$(OPTEE_CLIENT)
>  OPTEE_CLIENT_LICENSE	:= BSD-2-Clause
> +OPTEE_CLIENT_LICENSE_FILES := \
> +	file://LICENSE;md5=69663ab153298557a59c67a60a743e5b
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] optee-client: add option for supplicant plugin support

[Michael Olbrich]

Thanks, applied as 97a85508e5df3d97415f4c7380cbcf43ad9e412f.

Michael

[sent from post-receive hook]

On Sat, 05 Jul 2025 10:22:21 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Some applications, for example optee-xtest, may use supplicant plugins.
> 
> Add an option to enable the supplicant plugin support, if necessary.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250626150657.2728049-4-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 5d05d3bf5ebf..cb1033cb0533 100644
> --- a/rules/optee-client.in
> +++ b/rules/optee-client.in
> @@ -22,4 +22,8 @@ config OPTEE_CLIENT_SYSTEMD_UNIT
>  	depends on SYSTEMD
>  	prompt "install systemd service file for tee-supplicant"
>  
> +config OPTEE_CLIENT_SUPPLICANT_PLUGINS
> +	bool
> +	prompt "enable TEE supplicant plugins"
> +
>  endif
> diff --git a/rules/optee-client.make b/rules/optee-client.make
> index ef07b2ca8fb8..8ea127774b0d 100644
> --- a/rules/optee-client.make
> +++ b/rules/optee-client.make
> @@ -46,7 +46,7 @@ OPTEE_CLIENT_CONF_OPT	:= \
>  	-DCFG_TEE_SUPPL_GROUP=teesuppl \
>  	-DCFG_TEE_SUPPL_USER=teesuppl \
>  	-DCFG_TEE_SUPP_LOG_LEVEL=1 \
> -	-DCFG_TEE_SUPP_PLUGINS=OFF \
> +	-DCFG_TEE_SUPP_PLUGINS=$(call ptx/onoff, PTXCONF_OPTEE_CLIENT_SUPPLICANT_PLUGINS) \
>  	-DCFG_WERROR=ON \
>  	-DRPMB_EMU=ON \
>  	-DWITH_TEEACL=ON

Re: [ptxdist] [APPLIED] optee-test: set libdir and bindir

[Michael Olbrich]

Thanks, applied as dd4378735f06f9bb5a5dc53944f7a82e7ab5da56.

Michael

[sent from post-receive hook]

On Sat, 05 Jul 2025 10:22:22 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> optee-test by default sets ${libdir} to /lib and ${bindir} to /bin. As a
> workaround, the ptxdist rule adds /usr to ${DESTDIR} to install into
> /usr. This doesn't work, if files not be installed into /usr or a path
> already contains /usr.
> 
> Thus, set libdir and bindir to include /usr and drop /usr from DESTDIR
> to install files relative to the root directory.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250626150657.2728049-5-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/optee-test.make b/rules/optee-test.make
> index 83b149461afd..4984c2bed16f 100644
> --- a/rules/optee-test.make
> +++ b/rules/optee-test.make
> @@ -36,7 +36,9 @@ OPTEE_TEST_MAKE_ENV	:= \
>  	CROSS_COMPILE_TA=$(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) \
>  	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
>  	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
> -	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib
> +	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib \
> +	bindir=/usr/bin \
> +	libdir=/usr/lib
>  
>  OPTEE_TEST_CFLAGS	:= \
>  	-Wno-error=deprecated-declarations
> @@ -45,7 +47,7 @@ OPTEE_TEST_CFLAGS	:= \
>  # Install
>  # ----------------------------------------------------------------------------
>  
> -OPTEE_TEST_INSTALL_OPT := install DESTDIR=$(OPTEE_TEST_PKGDIR)/usr/
> +OPTEE_TEST_INSTALL_OPT := install DESTDIR=$(OPTEE_TEST_PKGDIR)
>  
>  $(STATEDIR)/optee-test.install:
>  	@$(call targetinfo)

Re: [ptxdist] [APPLIED] optee-test: install tee-supplicant plugins

[Michael Olbrich]

Thanks, applied as 8a75fb136f0df9dfe306342a049100762f4a52c7.

Michael

[sent from post-receive hook]

On Sat, 05 Jul 2025 10:22:23 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> The regression_1033 test tests if OP-TEE supports tee supplicant
> plugins.
> 
> For this test, optee-test has to install the built plugins and requires
> plugin support in the tee-supplicant.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250626150657.2728049-6-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/optee-test.in b/rules/optee-test.in
> index ceb342bea1a6..47859a299520 100644
> --- a/rules/optee-test.in
> +++ b/rules/optee-test.in
> @@ -3,6 +3,7 @@
>  config OPTEE_TEST
>  	tristate
>  	select OPTEE_CLIENT
> +	select OPTEE_CLIENT_SUPPLICANT_PLUGINS
>  	select OPTEE
>  	select OPENSSL
>  	prompt "optee-test"
> diff --git a/rules/optee-test.make b/rules/optee-test.make
> index 4984c2bed16f..dbb04744be71 100644
> --- a/rules/optee-test.make
> +++ b/rules/optee-test.make
> @@ -37,6 +37,7 @@ OPTEE_TEST_MAKE_ENV	:= \
>  	TA_DEV_KIT_DIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib/optee-os \
>  	OPTEE_CLIENT_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr \
>  	COMPILE_NS_USER=32 OPTEE_OPENSSL_EXPORT=$(PTXDIST_SYSROOT_TARGET)/usr/lib \
> +	CFG_TEE_PLUGIN_LOAD_PATH=/usr/lib/tee-supplicant/plugins \
>  	bindir=/usr/bin \
>  	libdir=/usr/lib
>  
> @@ -70,6 +71,7 @@ $(STATEDIR)/optee-test.targetinstall:
>  
>  	@$(call install_copy, optee-test, 0, 0, 0755, -, /usr/bin/optee-xtest)
>  	@$(call install_tree, optee-test, 0, 0, -, /usr/lib/optee_armtz)
> +	@$(call install_tree, optee-test, 0, 0, -, /usr/lib/tee-supplicant/plugins)
>  
>  	@$(call install_finish, optee-test)
>  

Re: [ptxdist] [APPLIED] optee-test: set OPTEE_TEST_LICENSE_FILES

[Michael Olbrich]

Thanks, applied as 604de98cefb513057d5b00e75e3d37f6d678baa0.

Michael

[sent from post-receive hook]

On Sat, 05 Jul 2025 10:22:24 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20250626150657.2728049-7-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/optee-test.make b/rules/optee-test.make
> index dbb04744be71..2163920b59b4 100644
> --- a/rules/optee-test.make
> +++ b/rules/optee-test.make
> @@ -24,6 +24,9 @@ OPTEE_TEST_URL		:= https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VER
>  OPTEE_TEST_SOURCE	:= $(SRCDIR)/$(OPTEE_TEST).$(OPTEE_TEST_SUFFIX)
>  OPTEE_TEST_DIR		:= $(BUILDDIR)/$(OPTEE_TEST)
>  OPTEE_TEST_LICENSE	:= BSD-2-Clause and GPL-2.0
> +OPTEE_TEST_LICENSE_FILES	:= \
> +	file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
> +	file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d
>  
>  # ----------------------------------------------------------------------------
>  # Prepare