All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0
@ 2022-12-09  7:51 Etienne Carriere
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 2/5] package/optee-benchmark: " Etienne Carriere
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Etienne Carriere @ 2022-12-09  7:51 UTC (permalink / raw)
  To: buildroot; +Cc: Etienne Carriere

Bumps OP-TEE OS package version to OP-TEE release 3.19.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
No change since v1
---
 boot/optee-os/Config.in     | 4 ++--
 boot/optee-os/optee-os.hash | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 5244700bc2..8bcce22306 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -18,7 +18,7 @@ choice
 	  Select the version of OP-TEE OS you want to use
 
 config BR2_TARGET_OPTEE_OS_LATEST
-	bool "3.18.0"
+	bool "3.19.0"
 	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
 	select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
 	help
@@ -70,7 +70,7 @@ endif
 
 config BR2_TARGET_OPTEE_OS_VERSION
 	string
-	default "3.18.0"	if BR2_TARGET_OPTEE_OS_LATEST
+	default "3.19.0"	if BR2_TARGET_OPTEE_OS_LATEST
 	default "custom"	if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL
 	default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
index 38f68bec5d..a87f21a9bf 100644
--- a/boot/optee-os/optee-os.hash
+++ b/boot/optee-os/optee-os.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.18.0/optee-os-3.18.0.tar.gz
-sha256  bdd309697745ec4406951652094b50d9adb06c3612f01bd8a3d72682ec8e03e8  optee-os-3.18.0.tar.gz
+# From https://github.com/OP-TEE/optee_os/archive/3.19.0/optee-os-3.19.0.tar.gz
+sha256  5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868  optee-os-3.19.0.tar.gz
 # Locally computed
 sha256  1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2 2/5] package/optee-benchmark: bump to version 3.19.0
  2022-12-09  7:51 [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0 Etienne Carriere
@ 2022-12-09  7:51 ` Etienne Carriere
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 3/5] package/optee-client: " Etienne Carriere
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Etienne Carriere @ 2022-12-09  7:51 UTC (permalink / raw)
  To: buildroot; +Cc: Etienne Carriere

Bumps OP-TEE benchmark package version to OP-TEE release 3.19.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
No change since v1.
---
 package/optee-benchmark/optee-benchmark.hash | 4 ++--
 package/optee-benchmark/optee-benchmark.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
index 27c91e0fb0..d74a24c8ab 100644
--- a/package/optee-benchmark/optee-benchmark.hash
+++ b/package/optee-benchmark/optee-benchmark.hash
@@ -1,4 +1,4 @@
-# From https://github.com/linaro-swg/optee_benchmark/archive/3.18.0/optee-benchmark-3.18.0.tar.gz
-sha256  2151aa5da062402518f35823d9c9dffa2e012f924625d2f7123e0d21d350a86b  optee-benchmark-3.18.0.tar.gz
+# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz
+sha256  32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c  optee-benchmark-3.19.0.tar.gz
 # Locally computed
 sha256  0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383  LICENSE
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
index 1071c4bb5c..338a51ada4 100644
--- a/package/optee-benchmark/optee-benchmark.mk
+++ b/package/optee-benchmark/optee-benchmark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_BENCHMARK_VERSION = 3.18.0
+OPTEE_BENCHMARK_VERSION = 3.19.0
 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
 OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
 OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2 3/5] package/optee-client: bump to version 3.19.0
  2022-12-09  7:51 [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0 Etienne Carriere
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 2/5] package/optee-benchmark: " Etienne Carriere
@ 2022-12-09  7:51 ` Etienne Carriere
  2022-12-10 10:11   ` Yann E. MORIN
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 4/5] package/optee-examples: " Etienne Carriere
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Etienne Carriere @ 2022-12-09  7:51 UTC (permalink / raw)
  To: buildroot; +Cc: Etienne Carriere

Bumps OP-TEE client package version to OP-TEE release 3.19.0.

This package introduces a mandatory dependency on util-linux and
pk-config packages that were made optional in commit [1], following
3.19.0 release tag. The dependency is related to new library teeacl
for access control list based login identification. This change picks
that commit and defines the dependency only when TEEACL library is
to be embedded. The patch will be removed once we dump to the next
OP-TEE release tag, as state by new BR2 boolean config switch
BR2_PACKAGE_OPTEE_CLIENT_TEEACL.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
Changes since v1:
- Squashes 2 commits from v1 series.
- Adds OP-TEE Client fixup commit and new package config switch
  BR2_PACKAGE_OPTEE_CLIENT_TEEACL to not mandate dependency on
  pkg-config and usr-linux (libuuid).

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 ...condition-libteeacl-with-WITH_TEEACL.patch | 102 ++++++++++++++++++
 package/optee-client/Config.in                |  10 ++
 package/optee-client/optee-client.hash        |   4 +-
 package/optee-client/optee-client.mk          |  12 ++-
 4 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch

diff --git a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
new file mode 100644
index 0000000000..53e7c4bf91
--- /dev/null
+++ b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
@@ -0,0 +1,102 @@
+From 8e060441a50201b10aa61bc83c57d758bfe19cf1 Mon Sep 17 00:00:00 2001
+From: Etienne Carriere <etienne.carriere@linaro.org>
+Date: Thu, 10 Nov 2022 12:05:24 +0100
+Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL
+
+Build and embed libteeacl upon WITH_TEEACL=1 (default configuration).
+This configuration switch allows one to build OP-TEE client without
+dependencies on pkg-config and libuuid  when OP-TEE ACL for
+PKCS11 is not needed:
+ cmake -DWITH_TEEACL=0 ...
+or
+ make WITH_TEEACL=0 ...
+
+With the comments below addressed, LGTM.
+
+Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
+Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
+Reviewed-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
+Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
+---
+ CMakeLists.txt |  9 ++++++---
+ Makefile       | 15 ++++++++++++---
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0786752..9fb5c6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,7 @@ project (optee_client C)
+ set (CMAKE_TOOLCHAIN_FILE CMakeToolchain.txt)
+ 
+ set (CFG_WERROR 1 CACHE BOOL "Build with -Werror")
++option (WITH_TEEACL "Build libteeacl" TRUE)
+ 
+ include(GNUInstallDirs)
+ 
+@@ -37,7 +38,9 @@ add_subdirectory (libteec)
+ add_subdirectory (tee-supplicant)
+ add_subdirectory (public)
+ add_subdirectory (libckteec)
+-find_package (PkgConfig REQUIRED)
+-pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid)
+-add_subdirectory (libteeacl)
++if(WITH_TEEACL)
++    find_package (PkgConfig REQUIRED)
++    pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid)
++    add_subdirectory (libteeacl)
++endif(WITH_TEEACL)
+ add_subdirectory (libseteec)
+diff --git a/Makefile b/Makefile
+index 90b487e..2ee5621 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,6 +16,8 @@ SBINDIR ?= /usr/sbin
+ LIBDIR ?= /usr/lib
+ INCLUDEDIR ?= /usr/include
+ 
++WITH_TEEACL ?= 1
++
+ .PHONY: all build build-libteec build-libckteec build-libseteec \
+ 	build-libteeacl check-libuuid install copy_export clean cscope \
+ 	clean-cscope \
+@@ -35,8 +37,10 @@ build-tee-supplicant: build-libteec
+ 	@echo "Building tee-supplicant"
+ 	$(MAKE) --directory=tee-supplicant  --no-print-directory --no-builtin-variables CFG_TEE_SUPP_LOG_LEVEL=$(CFG_TEE_SUPP_LOG_LEVEL)
+ 
+-build: build-libteec build-tee-supplicant build-libckteec build-libseteec \
+-	build-libteeacl
++build: build-libteec build-tee-supplicant build-libckteec build-libseteec
++ifeq ($(WITH_TEEACL),1)
++build: build-libteeacl
++endif
+ 
+ build-libckteec: build-libteec
+ 	@echo "Building libckteec.so"
+@@ -57,7 +61,10 @@ check-libuuid:
+ install: copy_export
+ 
+ clean: clean-libteec clean-tee-supplicant clean-cscope clean-libckteec \
+-	clean-libseteec clean-libteeacl
++	clean-libseteec
++ifeq ($(WITH_TEEACL),1)
++clean: clean-libteeacl
++endif
+ 
+ clean-libteec:
+ 	@$(MAKE) --directory=libteec --no-print-directory clean
+@@ -158,9 +165,11 @@ copy_export: build
+ 	cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR)
+ 	cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR)
+ 	cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR)
++ifeq ($(WITH_TEEACL),1)
+ 	cp libteeacl/include/*.h $(DESTDIR)$(INCLUDEDIR)
+ 	cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(LIBDIR)
+ 	cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(LIBDIR)
++endif
+ 	cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR)
+ 	cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR)
+ 	cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR)
+-- 
+2.25.1
+
diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
index cc7f176c77..3307a0ea83 100644
--- a/package/optee-client/Config.in
+++ b/package/optee-client/Config.in
@@ -37,6 +37,16 @@ config BR2_PACKAGE_OPTEE_CLIENT_SUPP_PLUGINS
 	help
 	  Enable TEE supplicant plugin support.
 
+config BR2_PACKAGE_OPTEE_CLIENT_TEEACL
+	bool "Enable TEE Access Control List login"
+	default y
+	depends on BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBS
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	help
+	  Enable TEE ACL login identification for OP-TEE service that
+	  supports them as OP-TEE PKCS#11 services.
+
 endif
 
 comment "optee-client needs a toolchain w/ threads, headers >= 4.3"
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index 8e55bf5725..c067e26f4e 100644
--- a/package/optee-client/optee-client.hash
+++ b/package/optee-client/optee-client.hash
@@ -1,4 +1,4 @@
-# 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
+# From https://github.com/OP-TEE/optee_client/archive/3.19.0/optee-client-3.19.0.tar.gz
+sha256  5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644  optee-client-3.19.0.tar.gz
 # Locally computed
 sha256  fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index 3fbbe9484c..d03791d3ad 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -4,12 +4,16 @@
 #
 ################################################################################
 
-OPTEE_CLIENT_VERSION = 3.18.0
+OPTEE_CLIENT_VERSION = 3.19.0
 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
 OPTEE_CLIENT_LICENSE = BSD-2-Clause
 OPTEE_CLIENT_LICENSE_FILES = LICENSE
 OPTEE_CLIENT_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y)
+OPTEE_CLIENT_EXT_DEPENDENCIES = host-pkgconf util-linux-libs
+endif
+
 OPTEE_CLIENT_CONF_OPTS = \
 	-DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) \
 	-DCFG_WERROR=OFF
@@ -26,6 +30,12 @@ else
 OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y)
+OPTEE_CLIENT_CONF_OPTS = -DWITH_TEEACL=ON
+else
+OPTEE_CLIENT_CONF_OPTS = -DWITH_TEEACL=OFF
+endif
+
 define OPTEE_CLIENT_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30tee-supplicant \
 		$(TARGET_DIR)/etc/init.d/S30tee-supplicant
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2 4/5] package/optee-examples: bump to version 3.19.0
  2022-12-09  7:51 [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0 Etienne Carriere
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 2/5] package/optee-benchmark: " Etienne Carriere
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 3/5] package/optee-client: " Etienne Carriere
@ 2022-12-09  7:51 ` Etienne Carriere
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 5/5] package/optee-test: " Etienne Carriere
  2022-12-10 10:12 ` [Buildroot] [PATCH v2 1/5] boot/optee-os: " Yann E. MORIN
  4 siblings, 0 replies; 9+ messages in thread
From: Etienne Carriere @ 2022-12-09  7:51 UTC (permalink / raw)
  To: buildroot; +Cc: Etienne Carriere

Bumps OP-TEE examples package version to OP-TEE release 3.19.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
No change since v1.
---
 package/optee-examples/optee-examples.hash | 4 ++--
 package/optee-examples/optee-examples.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash
index 876584c5e9..937dd44c8c 100644
--- a/package/optee-examples/optee-examples.hash
+++ b/package/optee-examples/optee-examples.hash
@@ -1,4 +1,4 @@
-# From https://github.com/linaro-swg/optee_examples/archive/3.18.0/optee-examples-3.18.0.tar.gz
-sha256  6c64fbc6c5d1282b6311b4076351abbbfab10ac918c6cfc60e45ec705bb5a9ec  optee-examples-3.18.0.tar.gz
+# From https://github.com/linaro-swg/optee_examples/archive/3.19.0/optee-examples-3.19.0.tar.gz
+sha256  545f9438885220e890a4f785249a586a957b22dacc31a3cbafa4656f8e9db349  optee-examples-3.19.0.tar.gz
 # Locally computed
 sha256  6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9  LICENSE
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index 17adce0fe0..bb2b208583 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_EXAMPLES_VERSION = 3.18.0
+OPTEE_EXAMPLES_VERSION = 3.19.0
 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
 OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
 OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v2 5/5] package/optee-test: bump to version 3.19.0
  2022-12-09  7:51 [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0 Etienne Carriere
                   ` (2 preceding siblings ...)
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 4/5] package/optee-examples: " Etienne Carriere
@ 2022-12-09  7:51 ` Etienne Carriere
  2022-12-10 10:12 ` [Buildroot] [PATCH v2 1/5] boot/optee-os: " Yann E. MORIN
  4 siblings, 0 replies; 9+ messages in thread
From: Etienne Carriere @ 2022-12-09  7:51 UTC (permalink / raw)
  To: buildroot; +Cc: Etienne Carriere

Bumps OP-TEE test package version to OP-TEE release 3.19.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
No change since v1.
---
 package/optee-test/optee-test.hash | 4 ++--
 package/optee-test/optee-test.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
index 2af1768155..4da3807bb5 100644
--- a/package/optee-test/optee-test.hash
+++ b/package/optee-test/optee-test.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_test/archive/3.18.0/optee-test-3.18.0.tar.gz
-sha256  cc36a9afb99bd299a3d3769ad634ab7d5cb0e27c84ad04e14c0ff593db0f3faf  optee-test-3.18.0.tar.gz
+# From https://github.com/OP-TEE/optee_test/archive/3.19.0/optee-test-3.19.0.tar.gz
+sha256  9435901e9329a25ef4de3904e27d80377b8bb4dd6b215e8fb29d66a7b76afa11  optee-test-3.19.0.tar.gz
 # Locally computed
 sha256  6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7  LICENSE.md
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index d522bb3300..7b065b6123 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_TEST_VERSION = 3.18.0
+OPTEE_TEST_VERSION = 3.19.0
 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
 OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
 OPTEE_TEST_LICENSE_FILES = LICENSE.md
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v2 3/5] package/optee-client: bump to version 3.19.0
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 3/5] package/optee-client: " Etienne Carriere
@ 2022-12-10 10:11   ` Yann E. MORIN
  2022-12-11 14:03     ` Yann E. MORIN
  0 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2022-12-10 10:11 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: buildroot

Étienne, All,

On 2022-12-09 08:51 +0100, Etienne Carriere spake thusly:
> Bumps OP-TEE client package version to OP-TEE release 3.19.0.
> 
> This package introduces a mandatory dependency on util-linux and
> pk-config packages that were made optional in commit [1], following
> 3.19.0 release tag. The dependency is related to new library teeacl
> for access control list based login identification. This change picks
> that commit and defines the dependency only when TEEACL library is
> to be embedded. The patch will be removed once we dump to the next
> OP-TEE release tag, as state by new BR2 boolean config switch
> BR2_PACKAGE_OPTEE_CLIENT_TEEACL.

We usually do not like to carry feature patches, but this one is
actually upstream, so that's OK-ish. So I kept it.

> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> Changes since v1:
> - Squashes 2 commits from v1 series.
> - Adds OP-TEE Client fixup commit and new package config switch
>   BR2_PACKAGE_OPTEE_CLIENT_TEEACL to not mandate dependency on
>   pkg-config and usr-linux (libuuid).
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
>  ...condition-libteeacl-with-WITH_TEEACL.patch | 102 ++++++++++++++++++
>  package/optee-client/Config.in                |  10 ++
>  package/optee-client/optee-client.hash        |   4 +-
>  package/optee-client/optee-client.mk          |  12 ++-
>  4 files changed, 125 insertions(+), 3 deletions(-)
>  create mode 100644 package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
> 
> diff --git a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
> new file mode 100644
> index 0000000000..53e7c4bf91
> --- /dev/null
> +++ b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
> @@ -0,0 +1,102 @@
> +From 8e060441a50201b10aa61bc83c57d758bfe19cf1 Mon Sep 17 00:00:00 2001

Not sure where you got that sha1, but upstream commit is
bbdf665aba39c29a3ce7bd06e4554c62a416ebaa, so I actually backported that
instead.

> +From: Etienne Carriere <etienne.carriere@linaro.org>
> +Date: Thu, 10 Nov 2022 12:05:24 +0100
> +Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL
> +
> +Build and embed libteeacl upon WITH_TEEACL=1 (default configuration).
> +This configuration switch allows one to build OP-TEE client without
> +dependencies on pkg-config and libuuid  when OP-TEE ACL for
> +PKCS11 is not needed:
> + cmake -DWITH_TEEACL=0 ...
> +or
> + make WITH_TEEACL=0 ...
> +
> +With the comments below addressed, LGTM.
> +
> +Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
> +Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
> +Reviewed-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
> +Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

We also like to see a comment that this is an actual backport, so I
added it.

[--SNIP--]
> diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
> index cc7f176c77..3307a0ea83 100644
> --- a/package/optee-client/Config.in
> +++ b/package/optee-client/Config.in
> @@ -37,6 +37,16 @@ config BR2_PACKAGE_OPTEE_CLIENT_SUPP_PLUGINS
>  	help
>  	  Enable TEE supplicant plugin support.
>  
> +config BR2_PACKAGE_OPTEE_CLIENT_TEEACL
> +	bool "Enable TEE Access Control List login"
> +	default y

Why did you make it default to 'y'? It is a new feature, and you
backport a patch from upstream to make it optional, so there is no
reason to enable it by default, is there?

I dropped that, but if you believe it should defaut to y, then please
send a folow-up patch that explains why.

> +	depends on BR2_PACKAGE_UTIL_LINUX

I also changed that into a select, like we do almost eveywhere else. We
have a single location that depends on util-linux, but I just noticed it
is a spurious dependency, I'll send a patch to remove it.

> +	select BR2_PACKAGE_UTIL_LINUX_LIBS

That should usually not be needed, is only used to break a circular
dependency chan in special cases. I could not spot such a chain here, so
I dropped the _LIBS.

[--SNIP--]
> diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
> index 3fbbe9484c..d03791d3ad 100644
> --- a/package/optee-client/optee-client.mk
> +++ b/package/optee-client/optee-client.mk
> @@ -4,12 +4,16 @@
>  #
>  ################################################################################
>  
> -OPTEE_CLIENT_VERSION = 3.18.0
> +OPTEE_CLIENT_VERSION = 3.19.0
>  OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
>  OPTEE_CLIENT_LICENSE = BSD-2-Clause
>  OPTEE_CLIENT_LICENSE_FILES = LICENSE
>  OPTEE_CLIENT_INSTALL_STAGING = YES
>  
> +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y)
> +OPTEE_CLIENT_EXT_DEPENDENCIES = host-pkgconf util-linux-libs

    $ make check-package
    package/optee-client/optee-client.mk:14: conditional override of variable OPTEE_CLIENT_EXT_DEPENDENCIES

> +endif
> +
>  OPTEE_CLIENT_CONF_OPTS = \
>  	-DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) \
>  	-DCFG_WERROR=OFF
> @@ -26,6 +30,12 @@ else
>  OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y)
> +OPTEE_CLIENT_CONF_OPTS = -DWITH_TEEACL=ON
> +else
> +OPTEE_CLIENT_CONF_OPTS = -DWITH_TEEACL=OFF

    $ make check-package
    package/optee-client/optee-client.mk:34: conditional override of variable OPTEE_CLIENT_CONF_OPTS
    package/optee-client/optee-client.mk:36: conditional override of variable OPTEE_CLIENT_CONF_OPTS

Also, why did you add the condition twice, once to add the dependency
and one to add the conf opts? I squashed the two together.

Applied to master with all the above fixed, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0
  2022-12-09  7:51 [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0 Etienne Carriere
                   ` (3 preceding siblings ...)
  2022-12-09  7:51 ` [Buildroot] [PATCH v2 5/5] package/optee-test: " Etienne Carriere
@ 2022-12-10 10:12 ` Yann E. MORIN
  4 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-12-10 10:12 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: buildroot

Étienne, All,

On 2022-12-09 08:51 +0100, Etienne Carriere spake thusly:
> Bumps OP-TEE OS package version to OP-TEE release 3.19.0.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

Series applied to master, thanks. See patch 3, on which I had to do
quite some fixups.

Regards,
Yann E. MORIN.

> ---
> No change since v1
> ---
>  boot/optee-os/Config.in     | 4 ++--
>  boot/optee-os/optee-os.hash | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
> index 5244700bc2..8bcce22306 100644
> --- a/boot/optee-os/Config.in
> +++ b/boot/optee-os/Config.in
> @@ -18,7 +18,7 @@ choice
>  	  Select the version of OP-TEE OS you want to use
>  
>  config BR2_TARGET_OPTEE_OS_LATEST
> -	bool "3.18.0"
> +	bool "3.19.0"
>  	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
>  	select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
>  	help
> @@ -70,7 +70,7 @@ endif
>  
>  config BR2_TARGET_OPTEE_OS_VERSION
>  	string
> -	default "3.18.0"	if BR2_TARGET_OPTEE_OS_LATEST
> +	default "3.19.0"	if BR2_TARGET_OPTEE_OS_LATEST
>  	default "custom"	if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL
>  	default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
>  				if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
> diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
> index 38f68bec5d..a87f21a9bf 100644
> --- a/boot/optee-os/optee-os.hash
> +++ b/boot/optee-os/optee-os.hash
> @@ -1,4 +1,4 @@
> -# From https://github.com/OP-TEE/optee_os/archive/3.18.0/optee-os-3.18.0.tar.gz
> -sha256  bdd309697745ec4406951652094b50d9adb06c3612f01bd8a3d72682ec8e03e8  optee-os-3.18.0.tar.gz
> +# From https://github.com/OP-TEE/optee_os/archive/3.19.0/optee-os-3.19.0.tar.gz
> +sha256  5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868  optee-os-3.19.0.tar.gz
>  # Locally computed
>  sha256  1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v2 3/5] package/optee-client: bump to version 3.19.0
  2022-12-10 10:11   ` Yann E. MORIN
@ 2022-12-11 14:03     ` Yann E. MORIN
  2022-12-11 21:50       ` Etienne Carriere
  0 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2022-12-11 14:03 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: Thomas Petazzoni, buildroot

Étienne, All,

On 2022-12-10 11:11 +0100, Yann E. MORIN spake thusly:
> On 2022-12-09 08:51 +0100, Etienne Carriere spake thusly:
> > Bumps OP-TEE client package version to OP-TEE release 3.19.0.
[--SNIP--]
> > +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y)
> > +OPTEE_CLIENT_EXT_DEPENDENCIES = host-pkgconf util-linux-libs

I missed changing the dependency to util-linux here, as noticed by
Thomas, so I just pushed a follow-up commit to fix that.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v2 3/5] package/optee-client: bump to version 3.19.0
  2022-12-11 14:03     ` Yann E. MORIN
@ 2022-12-11 21:50       ` Etienne Carriere
  0 siblings, 0 replies; 9+ messages in thread
From: Etienne Carriere @ 2022-12-11 21:50 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: Thomas Petazzoni, buildroot

Hello Yann,

Thanks for all the fixups and merging the upgrade.
I'll try to better follow BR's coding style in the future.

Best regards,
Etienne


On Sun, 11 Dec 2022 at 15:03, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Étienne, All,
>
> On 2022-12-10 11:11 +0100, Yann E. MORIN spake thusly:
> > On 2022-12-09 08:51 +0100, Etienne Carriere spake thusly:
> > > Bumps OP-TEE client package version to OP-TEE release 3.19.0.
> [--SNIP--]
> > > +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y)
> > > +OPTEE_CLIENT_EXT_DEPENDENCIES = host-pkgconf util-linux-libs
>
> I missed changing the dependency to util-linux here, as noticed by
> Thomas, so I just pushed a follow-up commit to fix that.
>
> Regards,
> Yann E. MORIN.
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-12-11 21:51 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-09  7:51 [Buildroot] [PATCH v2 1/5] boot/optee-os: bump to version 3.19.0 Etienne Carriere
2022-12-09  7:51 ` [Buildroot] [PATCH v2 2/5] package/optee-benchmark: " Etienne Carriere
2022-12-09  7:51 ` [Buildroot] [PATCH v2 3/5] package/optee-client: " Etienne Carriere
2022-12-10 10:11   ` Yann E. MORIN
2022-12-11 14:03     ` Yann E. MORIN
2022-12-11 21:50       ` Etienne Carriere
2022-12-09  7:51 ` [Buildroot] [PATCH v2 4/5] package/optee-examples: " Etienne Carriere
2022-12-09  7:51 ` [Buildroot] [PATCH v2 5/5] package/optee-test: " Etienne Carriere
2022-12-10 10:12 ` [Buildroot] [PATCH v2 1/5] boot/optee-os: " Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.