Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark
@ 2023-05-02 15:47 Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 2/6] boot/optee-os: bump to version 3.21.0 Etienne Carriere
                   ` (5 more replies)
  0 siblings, 6 replies; 11+ messages in thread
From: Etienne Carriere @ 2023-05-02 15:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour, Etienne Carriere

Package optee-benchmark is no more maintained by OP-TEE community
hence don't enable that package in qemu_arm_vexpress_tz_defconfig.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 configs/qemu_arm_vexpress_tz_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig
index 576c441154..b24fab5e42 100644
--- a/configs/qemu_arm_vexpress_tz_defconfig
+++ b/configs/qemu_arm_vexpress_tz_defconfig
@@ -40,7 +40,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram"
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
 BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt"
-BR2_PACKAGE_OPTEE_BENCHMARK=y
 BR2_PACKAGE_OPTEE_EXAMPLES=y
 BR2_PACKAGE_OPTEE_TEST=y
 
-- 
2.25.1

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

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/6] boot/optee-os: bump to version 3.21.0
  2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
@ 2023-05-02 15:47 ` Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 3/6] package/optee-client: " Etienne Carriere
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: Etienne Carriere @ 2023-05-02 15:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour, Etienne Carriere

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

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 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 a3cb8390b4..cc2c90b5ac 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.19.0"
+	bool "3.21.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.19.0"	if BR2_TARGET_OPTEE_OS_LATEST
+	default "3.21.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 a87f21a9bf..cf3ee7a36e 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.19.0/optee-os-3.19.0.tar.gz
-sha256  5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868  optee-os-3.19.0.tar.gz
+# From https://github.com/OP-TEE/optee_os/archive/3.21.0/optee-os-3.21.0.tar.gz
+sha256  92a16e841b0bdb4bfcb1c20b6a1bd3309092203d534ed167dfdb5a5f395bf60b  optee-os-3.21.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] 11+ messages in thread
* [Buildroot] [PATCH 3/6] package/optee-client: bump to version 3.21.0
  2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 2/6] boot/optee-os: bump to version 3.21.0 Etienne Carriere
@ 2023-05-02 15:47 ` Etienne Carriere
  2023-05-07 21:37   ` Yann E. MORIN
  2023-05-02 15:47 ` [Buildroot] [PATCH 4/6] package/optee-test: " Etienne Carriere
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 11+ messages in thread
From: Etienne Carriere @ 2023-05-02 15:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour, Etienne Carriere

Bumps OP-TEE client package version to OP-TEE release 3.21.0.
Removes the 2 local patches that have been integrated into mainline
repository before release tag 3.21.0.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 ...condition-libteeacl-with-WITH_TEEACL.patch | 105 ------------------
 ...-use-realloc-instead-of-reallocarray.patch |  34 ------
 package/optee-client/optee-client.hash        |   4 +-
 package/optee-client/optee-client.mk          |   2 +-
 4 files changed, 3 insertions(+), 142 deletions(-)
 delete mode 100644 package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
 delete mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.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
deleted file mode 100644
index 4fdf9afc94..0000000000
--- a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa 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>
-[etienne.carriere@linaro.org: backport upstream commit]
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
-[yann.morin.1998@free.fr: actually do a backport of bbdf665]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- 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/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch
deleted file mode 100644
index 88f5a4f87e..0000000000
--- a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001
-From: Eero Aaltonen <eero.aaltonen@vaisala.com>
-Date: Thu, 2 Feb 2023 17:22:29 +0200
-Subject: [PATCH] libteeacl: use realloc() instead of reallocarray()
-
-Use realloc() instead of reallocarray(), since uClibc apparently does
-not implement reallocarray().
-
-Fixes: https://github.com/OP-TEE/optee_client/issues/339
-
-Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
-Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
-
-[Retrieved from:
-https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- libteeacl/src/group.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c
-index 10965dd0..bd165a11 100644
---- a/libteeacl/src/group.c
-+++ b/libteeacl/src/group.c
-@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group)
- 	if (ret == -1) {
- 		p_groups = groups;
- 
--		groups = reallocarray(groups, grouplistsize, sizeof(gid_t));
-+		/* we use realloc, since uClibc does not implement reallocarray */
-+		groups = realloc(groups, grouplistsize * sizeof(gid_t));
- 		if (!groups) {
- 			free(p_groups);
- 			return E_MEMORY;
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index c067e26f4e..69016eae11 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.19.0/optee-client-3.19.0.tar.gz
-sha256  5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644  optee-client-3.19.0.tar.gz
+# From https://github.com/OP-TEE/optee_client/archive/3.21.0/optee-client-3.21.0.tar.gz
+sha256  368164a539b85557d2079fa6cd839ec444869109f96de65d6569e58b0615d026  optee-client-3.21.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 ef113c838f..4b95842efa 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_CLIENT_VERSION = 3.19.0
+OPTEE_CLIENT_VERSION = 3.21.0
 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
 OPTEE_CLIENT_LICENSE = BSD-2-Clause
 OPTEE_CLIENT_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] 11+ messages in thread
* [Buildroot] [PATCH 4/6] package/optee-test: bump to version 3.21.0
  2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 2/6] boot/optee-os: bump to version 3.21.0 Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 3/6] package/optee-client: " Etienne Carriere
@ 2023-05-02 15:47 ` Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 5/6] package/optee-examples: " Etienne Carriere
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: Etienne Carriere @ 2023-05-02 15:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour, Etienne Carriere

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

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 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 4da3807bb5..08b3331374 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.19.0/optee-test-3.19.0.tar.gz
-sha256  9435901e9329a25ef4de3904e27d80377b8bb4dd6b215e8fb29d66a7b76afa11  optee-test-3.19.0.tar.gz
+# From https://github.com/OP-TEE/optee_test/archive/3.21.0/optee-test-3.21.0.tar.gz
+sha256  44c7dc3df48e9d73f12bbbef1cc2a4e22d859ab8a5e67a07923267f924175d65  optee-test-3.21.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 7b065b6123..d306ef8269 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_TEST_VERSION = 3.19.0
+OPTEE_TEST_VERSION = 3.21.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] 11+ messages in thread
* [Buildroot] [PATCH 5/6] package/optee-examples: bump to version 3.21.0
  2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
                   ` (2 preceding siblings ...)
  2023-05-02 15:47 ` [Buildroot] [PATCH 4/6] package/optee-test: " Etienne Carriere
@ 2023-05-02 15:47 ` Etienne Carriere
  2023-05-02 15:47 ` [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package Etienne Carriere
  2023-05-07 21:35 ` [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Yann E. MORIN
  5 siblings, 0 replies; 11+ messages in thread
From: Etienne Carriere @ 2023-05-02 15:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour, Etienne Carriere

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

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 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 937dd44c8c..c61c434c60 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.19.0/optee-examples-3.19.0.tar.gz
-sha256  545f9438885220e890a4f785249a586a957b22dacc31a3cbafa4656f8e9db349  optee-examples-3.19.0.tar.gz
+# From https://github.com/linaro-swg/optee_examples/archive/3.21.0/optee-examples-3.21.0.tar.gz
+sha256  9b965f829adc532b5228534d3b9b38ae1fc4f2ac55d73159a39d43e59749f3ed  optee-examples-3.21.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 bb2b208583..c182bab4cc 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_EXAMPLES_VERSION = 3.19.0
+OPTEE_EXAMPLES_VERSION = 3.21.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] 11+ messages in thread
* [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package
  2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
                   ` (3 preceding siblings ...)
  2023-05-02 15:47 ` [Buildroot] [PATCH 5/6] package/optee-examples: " Etienne Carriere
@ 2023-05-02 15:47 ` Etienne Carriere
  2023-05-07 21:38   ` Yann E. MORIN
  2023-05-07 21:35 ` [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Yann E. MORIN
  5 siblings, 1 reply; 11+ messages in thread
From: Etienne Carriere @ 2023-05-02 15:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour, Etienne Carriere

Removes package optee-benchmark that is no more maintained as
pointed by discussion thread [1].

Link: [1] https://github.com/OP-TEE/optee_os/issues/5909
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 package/Config.in                            |  1 -
 package/optee-benchmark/Config.in            | 20 --------------------
 package/optee-benchmark/optee-benchmark.hash |  4 ----
 package/optee-benchmark/optee-benchmark.mk   | 14 --------------
 4 files changed, 39 deletions(-)
 delete mode 100644 package/optee-benchmark/Config.in
 delete mode 100644 package/optee-benchmark/optee-benchmark.hash
 delete mode 100644 package/optee-benchmark/optee-benchmark.mk

diff --git a/package/Config.in b/package/Config.in
index eaac32a01a..53c2d3b077 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2565,7 +2565,6 @@ menu "Security"
 	source "package/apparmor/Config.in"
 	source "package/checkpolicy/Config.in"
 	source "package/ima-evm-utils/Config.in"
-	source "package/optee-benchmark/Config.in"
 	source "package/optee-client/Config.in"
 	source "package/optee-examples/Config.in"
 	source "package/optee-test/Config.in"
diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
deleted file mode 100644
index 2070582fbb..0000000000
--- a/package/optee-benchmark/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config BR2_PACKAGE_OPTEE_BENCHMARK
-	bool "optee-benchmark"
-	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
-	depends on !BR2_STATIC_LIBS # optee-client
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
-	select BR2_PACKAGE_OPTEE_CLIENT
-	select BR2_PACKAGE_LIBYAML
-	help
-	  Enable the OP-TEE benchmark package that brings facilities
-	  for profiling traversal and execution timings when
-	  invoking OP-TEE. OP-TEE benchmark is a component delivered
-	  by the OP-TEE project.
-
-	  http://github.com/linaro-swg/optee_benchmark
-
-comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
deleted file mode 100644
index d74a24c8ab..0000000000
--- a/package/optee-benchmark/optee-benchmark.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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
deleted file mode 100644
index 338a51ada4..0000000000
--- a/package/optee-benchmark/optee-benchmark.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# optee-benchmark
-#
-################################################################################
-
-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
-
-OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
-
-$(eval $(cmake-package))
-- 
2.25.1

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

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark
  2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
                   ` (4 preceding siblings ...)
  2023-05-02 15:47 ` [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package Etienne Carriere
@ 2023-05-07 21:35 ` Yann E. MORIN
  5 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2023-05-07 21:35 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: Romain Naour, buildroot

Etienne, All,

On 2023-05-02 17:47 +0200, Etienne Carriere spake thusly:
> Package optee-benchmark is no more maintained by OP-TEE community
> hence don't enable that package in qemu_arm_vexpress_tz_defconfig.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

Whole series of 6 patches applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  configs/qemu_arm_vexpress_tz_defconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig
> index 576c441154..b24fab5e42 100644
> --- a/configs/qemu_arm_vexpress_tz_defconfig
> +++ b/configs/qemu_arm_vexpress_tz_defconfig
> @@ -40,7 +40,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram"
>  BR2_TARGET_OPTEE_OS=y
>  BR2_TARGET_OPTEE_OS_NEEDS_DTC=y
>  BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt"
> -BR2_PACKAGE_OPTEE_BENCHMARK=y
>  BR2_PACKAGE_OPTEE_EXAMPLES=y
>  BR2_PACKAGE_OPTEE_TEST=y
>  
> -- 
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 3/6] package/optee-client: bump to version 3.21.0
  2023-05-02 15:47 ` [Buildroot] [PATCH 3/6] package/optee-client: " Etienne Carriere
@ 2023-05-07 21:37   ` Yann E. MORIN
  0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2023-05-07 21:37 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: Romain Naour, buildroot

Etienne, All,

On 2023-05-02 17:47 +0200, Etienne Carriere spake thusly:
> Bumps OP-TEE client package version to OP-TEE release 3.21.0.
> Removes the 2 local patches that have been integrated into mainline
> repository before release tag 3.21.0.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
>  ...condition-libteeacl-with-WITH_TEEACL.patch | 105 ------------------
>  ...-use-realloc-instead-of-reallocarray.patch |  34 ------

Removed files that were ignored, must be dropped from
.checkpacakgeignore too.

Applied to master with the above fixed, thanks.

Regards,
Yann E. MORIN.

>  package/optee-client/optee-client.hash        |   4 +-
>  package/optee-client/optee-client.mk          |   2 +-
>  4 files changed, 3 insertions(+), 142 deletions(-)
>  delete mode 100644 package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
>  delete mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.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
> deleted file mode 100644
> index 4fdf9afc94..0000000000
> --- a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch
> +++ /dev/null
> @@ -1,105 +0,0 @@
> -From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa 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>
> -[etienne.carriere@linaro.org: backport upstream commit]
> -Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> -[yann.morin.1998@free.fr: actually do a backport of bbdf665]
> -Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> ----
> - 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/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch
> deleted file mode 100644
> index 88f5a4f87e..0000000000
> --- a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001
> -From: Eero Aaltonen <eero.aaltonen@vaisala.com>
> -Date: Thu, 2 Feb 2023 17:22:29 +0200
> -Subject: [PATCH] libteeacl: use realloc() instead of reallocarray()
> -
> -Use realloc() instead of reallocarray(), since uClibc apparently does
> -not implement reallocarray().
> -
> -Fixes: https://github.com/OP-TEE/optee_client/issues/339
> -
> -Signed-off-by: Eero Aaltonen <eero.aaltonen@vaisala.com>
> -Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
> -
> -[Retrieved from:
> -https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - libteeacl/src/group.c | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c
> -index 10965dd0..bd165a11 100644
> ---- a/libteeacl/src/group.c
> -+++ b/libteeacl/src/group.c
> -@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group)
> - 	if (ret == -1) {
> - 		p_groups = groups;
> - 
> --		groups = reallocarray(groups, grouplistsize, sizeof(gid_t));
> -+		/* we use realloc, since uClibc does not implement reallocarray */
> -+		groups = realloc(groups, grouplistsize * sizeof(gid_t));
> - 		if (!groups) {
> - 			free(p_groups);
> - 			return E_MEMORY;
> diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
> index c067e26f4e..69016eae11 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.19.0/optee-client-3.19.0.tar.gz
> -sha256  5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644  optee-client-3.19.0.tar.gz
> +# From https://github.com/OP-TEE/optee_client/archive/3.21.0/optee-client-3.21.0.tar.gz
> +sha256  368164a539b85557d2079fa6cd839ec444869109f96de65d6569e58b0615d026  optee-client-3.21.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 ef113c838f..4b95842efa 100644
> --- a/package/optee-client/optee-client.mk
> +++ b/package/optee-client/optee-client.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -OPTEE_CLIENT_VERSION = 3.19.0
> +OPTEE_CLIENT_VERSION = 3.21.0
>  OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
>  OPTEE_CLIENT_LICENSE = BSD-2-Clause
>  OPTEE_CLIENT_LICENSE_FILES = 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package
  2023-05-02 15:47 ` [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package Etienne Carriere
@ 2023-05-07 21:38   ` Yann E. MORIN
  2023-05-09  7:17     ` Etienne Carriere
  0 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2023-05-07 21:38 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: Romain Naour, buildroot

Etienne, All,

On 2023-05-02 17:47 +0200, Etienne Carriere spake thusly:
> Removes package optee-benchmark that is no more maintained as
> pointed by discussion thread [1].

This needs to be moved to Config.in.legacy, to inform users that used to
use optee-benchmark that they can't use it anymore.

Applied to master with the ab ove entry added, thanks.

And now when I write this, I notice I forgot to amend the commit before
I pushed, so I did a separate commit. Dang...

Regards,
Yann E. MORIN.

> Link: [1] https://github.com/OP-TEE/optee_os/issues/5909
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
>  package/Config.in                            |  1 -
>  package/optee-benchmark/Config.in            | 20 --------------------
>  package/optee-benchmark/optee-benchmark.hash |  4 ----
>  package/optee-benchmark/optee-benchmark.mk   | 14 --------------
>  4 files changed, 39 deletions(-)
>  delete mode 100644 package/optee-benchmark/Config.in
>  delete mode 100644 package/optee-benchmark/optee-benchmark.hash
>  delete mode 100644 package/optee-benchmark/optee-benchmark.mk
> 
> diff --git a/package/Config.in b/package/Config.in
> index eaac32a01a..53c2d3b077 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -2565,7 +2565,6 @@ menu "Security"
>  	source "package/apparmor/Config.in"
>  	source "package/checkpolicy/Config.in"
>  	source "package/ima-evm-utils/Config.in"
> -	source "package/optee-benchmark/Config.in"
>  	source "package/optee-client/Config.in"
>  	source "package/optee-examples/Config.in"
>  	source "package/optee-test/Config.in"
> diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
> deleted file mode 100644
> index 2070582fbb..0000000000
> --- a/package/optee-benchmark/Config.in
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -config BR2_PACKAGE_OPTEE_BENCHMARK
> -	bool "optee-benchmark"
> -	depends on BR2_USE_MMU # fork()
> -	depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
> -	depends on !BR2_STATIC_LIBS # optee-client
> -	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
> -	select BR2_PACKAGE_OPTEE_CLIENT
> -	select BR2_PACKAGE_LIBYAML
> -	help
> -	  Enable the OP-TEE benchmark package that brings facilities
> -	  for profiling traversal and execution timings when
> -	  invoking OP-TEE. OP-TEE benchmark is a component delivered
> -	  by the OP-TEE project.
> -
> -	  http://github.com/linaro-swg/optee_benchmark
> -
> -comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
> -	depends on BR2_USE_MMU
> -	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> -		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
> diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
> deleted file mode 100644
> index d74a24c8ab..0000000000
> --- a/package/optee-benchmark/optee-benchmark.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# 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
> deleted file mode 100644
> index 338a51ada4..0000000000
> --- a/package/optee-benchmark/optee-benchmark.mk
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -################################################################################
> -#
> -# optee-benchmark
> -#
> -################################################################################
> -
> -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
> -
> -OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
> -
> -$(eval $(cmake-package))
> -- 
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package
  2023-05-07 21:38   ` Yann E. MORIN
@ 2023-05-09  7:17     ` Etienne Carriere
  2023-05-09 15:44       ` Yann E. MORIN
  0 siblings, 1 reply; 11+ messages in thread
From: Etienne Carriere @ 2023-05-09  7:17 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: Romain Naour, buildroot

Hello Yann,

On Sun, 7 May 2023 at 23:38, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Etienne, All,
>
> On 2023-05-02 17:47 +0200, Etienne Carriere spake thusly:
> > Removes package optee-benchmark that is no more maintained as
> > pointed by discussion thread [1].
>
> This needs to be moved to Config.in.legacy, to inform users that used to
> use optee-benchmark that they can't use it anymore.
>
> Applied to master with the ab ove entry added, thanks.
>
> And now when I write this, I notice I forgot to amend the commit before
> I pushed, so I did a separate commit. Dang...

Thanks fixing the changes from my series..
I didn't even noticed patch files were listed .checkpacakgeignore.
I'll (try to) take care of that in the future.

br,
etienne

>
> Regards,
> Yann E. MORIN.
>
> > Link: [1] https://github.com/OP-TEE/optee_os/issues/5909
> > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> > ---
> >  package/Config.in                            |  1 -
> >  package/optee-benchmark/Config.in            | 20 --------------------
> >  package/optee-benchmark/optee-benchmark.hash |  4 ----
> >  package/optee-benchmark/optee-benchmark.mk   | 14 --------------
> >  4 files changed, 39 deletions(-)
> >  delete mode 100644 package/optee-benchmark/Config.in
> >  delete mode 100644 package/optee-benchmark/optee-benchmark.hash
> >  delete mode 100644 package/optee-benchmark/optee-benchmark.mk
> >
> > diff --git a/package/Config.in b/package/Config.in
> > index eaac32a01a..53c2d3b077 100644
> > --- a/package/Config.in
> > +++ b/package/Config.in
> > @@ -2565,7 +2565,6 @@ menu "Security"
> >       source "package/apparmor/Config.in"
> >       source "package/checkpolicy/Config.in"
> >       source "package/ima-evm-utils/Config.in"
> > -     source "package/optee-benchmark/Config.in"
> >       source "package/optee-client/Config.in"
> >       source "package/optee-examples/Config.in"
> >       source "package/optee-test/Config.in"
> > diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
> > deleted file mode 100644
> > index 2070582fbb..0000000000
> > --- a/package/optee-benchmark/Config.in
> > +++ /dev/null
> > @@ -1,20 +0,0 @@
> > -config BR2_PACKAGE_OPTEE_BENCHMARK
> > -     bool "optee-benchmark"
> > -     depends on BR2_USE_MMU # fork()
> > -     depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
> > -     depends on !BR2_STATIC_LIBS # optee-client
> > -     depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
> > -     select BR2_PACKAGE_OPTEE_CLIENT
> > -     select BR2_PACKAGE_LIBYAML
> > -     help
> > -       Enable the OP-TEE benchmark package that brings facilities
> > -       for profiling traversal and execution timings when
> > -       invoking OP-TEE. OP-TEE benchmark is a component delivered
> > -       by the OP-TEE project.
> > -
> > -       http://github.com/linaro-swg/optee_benchmark
> > -
> > -comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
> > -     depends on BR2_USE_MMU
> > -     depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> > -             !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
> > diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
> > deleted file mode 100644
> > index d74a24c8ab..0000000000
> > --- a/package/optee-benchmark/optee-benchmark.hash
> > +++ /dev/null
> > @@ -1,4 +0,0 @@
> > -# 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
> > deleted file mode 100644
> > index 338a51ada4..0000000000
> > --- a/package/optee-benchmark/optee-benchmark.mk
> > +++ /dev/null
> > @@ -1,14 +0,0 @@
> > -################################################################################
> > -#
> > -# optee-benchmark
> > -#
> > -################################################################################
> > -
> > -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
> > -
> > -OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
> > -
> > -$(eval $(cmake-package))
> > --
> > 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package
  2023-05-09  7:17     ` Etienne Carriere
@ 2023-05-09 15:44       ` Yann E. MORIN
  0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2023-05-09 15:44 UTC (permalink / raw)
  To: Etienne Carriere; +Cc: Romain Naour, buildroot

Etienne, All,

On 2023-05-09 09:17 +0200, Etienne Carriere spake thusly:
> I didn't even noticed patch files were listed .checkpacakgeignore.

That's relatively recent, and the tooling does not yet catches this
issue; see:
    https://patchwork.ozlabs.org/project/buildroot/patch/20230506212531.365446-1-yann.morin.1998@free.fr/

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] 11+ messages in thread
end of thread, other threads:[~2023-05-09 15:45 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-02 15:47 [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Etienne Carriere
2023-05-02 15:47 ` [Buildroot] [PATCH 2/6] boot/optee-os: bump to version 3.21.0 Etienne Carriere
2023-05-02 15:47 ` [Buildroot] [PATCH 3/6] package/optee-client: " Etienne Carriere
2023-05-07 21:37   ` Yann E. MORIN
2023-05-02 15:47 ` [Buildroot] [PATCH 4/6] package/optee-test: " Etienne Carriere
2023-05-02 15:47 ` [Buildroot] [PATCH 5/6] package/optee-examples: " Etienne Carriere
2023-05-02 15:47 ` [Buildroot] [PATCH 6/6] package/optee-benchmark: remove deprecated package Etienne Carriere
2023-05-07 21:38   ` Yann E. MORIN
2023-05-09  7:17     ` Etienne Carriere
2023-05-09 15:44       ` Yann E. MORIN
2023-05-07 21:35 ` [Buildroot] [PATCH 1/6] configs/qemu_arm_vexpress_tz_defconfig: don't embed optee-benchmark Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox