boot/optee-os: bump to version 3.13.0
PATCH 1/5 boot/optee-os: bump to version 3.13.0
Bump OP-TEE OS package version to OP-TEE release 3.13.0.
Add a patch already merged OP-TEE to fix build issue seen with 3.13.0 on some BR toolchain.
--- ...ild-warning-when-_LFS64_LARGEFILE-is.patch | 56 +++++++++++++++++++ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 boot/optee-os/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch
boot/optee-os/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch new file +56 -0
@@ -0,0 +1,56 @@ +From 82becbadd5918ed7ad3c2b651ce479084b5feb2a Mon Sep 17 00:00:00 2001 +From: Etienne Carriere <[email protected]> +Date: Mon, 10 May 2021 15:58:41 +0200 +Subject: core: zlib: fix build warning when _LFS64_LARGEFILE is not defined + +In zlib, _LFS64_LARGEFILE is expected to be a boolean directive, either +1 (true) or 0 (false). Depending on toolchain version and directives +build may produces warnings (as shown below with gcc 9.3) when the macro +is not defined hence this change to default it to value 0 (false). + +core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef] + 196 | (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + | ^~~~~~~~~~~~~~~~ +In file included from core/lib/zlib/adler32.c:9: +core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef] + 196 | (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + | ^~~~~~~~~~~~~~~~ + CC out/core/lib/zlib/zutil.o +In file included from core/lib/zlib/inftrees.c:7: +core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef] + 196 | (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + | ^~~~~~~~~~~~~~~~ +In file included from core/lib/zlib/inflate.c:84: +core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef] + 196 | (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + | ^~~~~~~~~~~~~~~~ +In file included from core/lib/zlib/zutil.c:9: +core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef] + 196 | (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + | ^~~~~~~~~~~~~~~~ + +Signed-off-by: Etienne Carriere <[email protected]> +Reviewed-by: Jens Wiklander <[email protected]> +--- + core/lib/zlib/zconf.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/core/lib/zlib/zconf.h b/core/lib/zlib/zconf.h +index 0bca18be..a7d13741 100644 +--- a/core/lib/zlib/zconf.h ++++ b/core/lib/zlib/zconf.h +@@ -487,6 +487,11 @@ typedef uLong FAR uLongf; + # endif + #endif + ++/* Other places expect _LFS64_LARGEFILE to be defined with a valid value */ ++#ifndef _LFS64_LARGEFILE ++#define _LFS64_LARGEFILE 0 ++#endif ++ + #if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 + # define Z_LFS64 + #endif +-- +2.17.1 +
boot/optee-os/Config.in +2 -2
@@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.12.0" + bool "3.13.0" help Use the latest release tag from the OP-TEE OS official Git repository.
@@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.12.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.13.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
boot/optee-os/optee-os.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.12.0/optee-os-3.12.0.tar.gz -sha256 b13991099f25d00dac479db93b55034cb93d206e296f2c7aa9c42b92bca2c783 optee-os-3.12.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.13.0/optee-os-3.13.0.tar.gz +sha256 c6629ba54f62a2624299f7d17cf6df2dadc902e6a862c62f85d1b6da6c909c3f optee-os-3.13.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
Signature · 1 line
2.17.1
PATCH 2/5 package/optee-benchmark: bump to version 3.13.0
Bump OP-TEE Benchmark package version to OP-TEE release 3.13.0.
--- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-benchmark/optee-benchmark.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.12.0/optee-benchmark-3.12.0.tar.gz -sha256 468635656fa483911cf605a96711d848f8e0f6b4a6137208226de364dee25fe4 optee-benchmark-3.12.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.13.0/optee-benchmark-3.13.0.tar.gz +sha256 58431b0d48c634dcb86d5e307df157a99256d4328a77a5099e0b1b3cd79e2968 optee-benchmark-3.13.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE
package/optee-benchmark/optee-benchmark.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.12.0 +OPTEE_BENCHMARK_VERSION = 3.13.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
PATCH 3/5 package/optee-client: bump to version 3.13.0
In reply to Etienne CarriereBump OP-TEE Client package version to OP-TEE release 3.13.0.
Remove patch since addressed in that release.
--- ...kteec-add-missing-unistd.h-for-gid_t.patch | 31 ------------------- package/optee-client/optee-client.hash | 4 +-- package/optee-client/optee-client.mk | 2 +- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 package/optee-client/0001-libckteec-add-missing-unistd.h-for-gid_t.patch
package/optee-client/0001-libckteec-add-missing-unistd.h-for-gid_t.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 6b908687d37dc4e5c00df90058990da034506628 Mon Sep 17 00:00:00 2001 -From: Etienne Carriere <[email protected]> -Date: Tue, 9 Mar 2021 11:52:32 +0100 -Subject: [PATCH 1/1] libckteec: add missing <unistd.h> for gid_t - -Include missing unistd.h to support type gid_t. This change fixes [1]. - -Link: [1] http://autobuild.buildroot.net/results/34b9946e6d59112a7eead304933534ad4739a84c/build-end.log -Signed-off-by: Etienne Carriere <[email protected]> -Acked-by: Jerome Forissier <[email protected]> -[yann.morin.1998 at free.fr: actual backport now that upstream applied it] -Signed-off-by: Yann E. MORIN <[email protected]> ---- - libckteec/src/invoke_ta.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libckteec/src/invoke_ta.c b/libckteec/src/invoke_ta.c -index 6236719..70575d0 100644 ---- a/libckteec/src/invoke_ta.c -+++ b/libckteec/src/invoke_ta.c -@@ -18,6 +18,7 @@ - #include <sys/types.h> - #include <tee_client_api.h> - #include <teec_trace.h> -+#include <unistd.h> - - #include "ck_helpers.h" - #include "invoke_ta.h" --- -2.25.1 -
package/optee-client/optee-client.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.12.0/optee-client-3.12.0.tar.gz -sha256 f75c45b40147217fa8f4a2ae1e4c06b24eb45d35167854fa9ad3ec3d6a73e858 optee-client-3.12.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.13.0/optee-client-3.13.0.tar.gz +sha256 2ec6f05f833dce458f0358104e83e28e9a7643b81cfd96db32a7a1fadcc1e3af optee-client-3.13.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
package/optee-client/optee-client.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.12.0 +OPTEE_CLIENT_VERSION = 3.13.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
PATCH 4/5 package/optee-examples: bump to version 3.13.0
In reply to Etienne CarriereBump OP-TEE Examples package version to OP-TEE release 3.13.0.
--- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-examples/optee-examples.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.12.0/optee-examples-3.12.0.tar.gz -sha256 d3ae2cc4c51900a887f4c93e58571305bd37d60718a281953c3d775b3113f1f8 optee-examples-3.12.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.13.0/optee-examples-3.13.0.tar.gz +sha256 2e97252a57a5d84fa5f33adec976cea2dbfb0e17f60b1ee912041be74f6b14f8 optee-examples-3.13.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE
package/optee-examples/optee-examples.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.12.0 +OPTEE_EXAMPLES_VERSION = 3.13.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
PATCH 5/5 package/optee-test: bump to version 3.13.0
In reply to Etienne CarriereBump OP-TEE Test package version to OP-TEE release 3.13.0.
--- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-test/optee-test.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.12.0/optee-test-3.12.0.tar.gz -sha256 beebdc98e95af2e7a20595f7d6ca716872efde1ec74a48ab07be599f21e8ad70 optee-test-3.12.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.13.0/optee-test-3.13.0.tar.gz +sha256 4dda2a6b2f7667664cc3bc2578a90c1e60fef7e1c296b8fa8f317ba93302a652 optee-test-3.13.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md
package/optee-test/optee-test.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.12.0 +OPTEE_TEST_VERSION = 3.13.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
Signature · 1 line
2.17.1
PATCH 1/5 boot/optee-os: bump to version 3.13.0
In reply to Etienne CarriereQuoted 5 lines · On Fri, 28 May 2021 09:35:07 +0200 Etienne Carriere…
Bump OP-TEE OS package version to OP-TEE release 3.13.0.
Add a patch already merged OP-TEE to fix build issue seen with 3.13.0 on some BR toolchain.
Quoted 7 lines
Signed-off-by Etienne Carriere <[email protected]>--- ...ild-warning-when-_LFS64_LARGEFILE-is.patch | 56 +++++++++++++++++++ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 boot/optee-os/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch
Thanks, series applied!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com