All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Etienne Carriere <etienne.carriere@linaro.org>
Cc: Romain Naour <romain.naour@gmail.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 3/6] package/optee-client: bump to version 3.21.0
Date: Sun, 7 May 2023 23:37:18 +0200	[thread overview]
Message-ID: <20230507213718.GS252090@scaer> (raw)
In-Reply-To: <20230502154713.1490788-3-etienne.carriere@linaro.org>

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

  reply	other threads:[~2023-05-07 21:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230507213718.GS252090@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=etienne.carriere@linaro.org \
    --cc=romain.naour@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.