* [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0
@ 2021-05-28 7:35 Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 2/5] package/optee-benchmark: " Etienne Carriere
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Etienne Carriere @ 2021-05-28 7:35 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
...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
diff --git a/boot/optee-os/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch b/boot/optee-os/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch
new file mode 100644
index 0000000000..0ff61dc524
--- /dev/null
+++ b/boot/optee-os/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch
@@ -0,0 +1,56 @@
+From 82becbadd5918ed7ad3c2b651ce479084b5feb2a Mon Sep 17 00:00:00 2001
+From: Etienne Carriere <etienne.carriere@linaro.org>
+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 <etienne.carriere@linaro.org>
+Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
+---
+ 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
+
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 8e833ecd75..4679fd2fde 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.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
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
index 36bc1d9593..3803a69797 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.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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/5] package/optee-benchmark: bump to version 3.13.0
2021-05-28 7:35 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0 Etienne Carriere
@ 2021-05-28 7:35 ` Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 3/5] package/optee-client: " Etienne Carriere
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2021-05-28 7:35 UTC (permalink / raw)
To: buildroot
Bump OP-TEE Benchmark package version to OP-TEE release 3.13.0.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
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 144069b6f3..51f248462b 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.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
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
index c17a7045d4..ce168def81 100644
--- a/package/optee-benchmark/optee-benchmark.mk
+++ b/package/optee-benchmark/optee-benchmark.mk
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/5] package/optee-client: bump to version 3.13.0
2021-05-28 7:35 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0 Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 2/5] package/optee-benchmark: " Etienne Carriere
@ 2021-05-28 7:35 ` Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 4/5] package/optee-examples: " Etienne Carriere
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2021-05-28 7:35 UTC (permalink / raw)
To: buildroot
Bump OP-TEE Client package version to OP-TEE release 3.13.0.
Remove patch since addressed in that release.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
...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
diff --git a/package/optee-client/0001-libckteec-add-missing-unistd.h-for-gid_t.patch b/package/optee-client/0001-libckteec-add-missing-unistd.h-for-gid_t.patch
deleted file mode 100644
index 534f1d3bee..0000000000
--- a/package/optee-client/0001-libckteec-add-missing-unistd.h-for-gid_t.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6b908687d37dc4e5c00df90058990da034506628 Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-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 <etienne.carriere@linaro.org>
-Acked-by: Jerome Forissier <jerome@forissier.org>
-[yann.morin.1998 at free.fr: actual backport now that upstream applied it]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- 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
-
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index 253c29e22a..5d14f1023c 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.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
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index 22f205e407..b73e76775e 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 4/5] package/optee-examples: bump to version 3.13.0
2021-05-28 7:35 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0 Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 2/5] package/optee-benchmark: " Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 3/5] package/optee-client: " Etienne Carriere
@ 2021-05-28 7:35 ` Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 5/5] package/optee-test: " Etienne Carriere
2021-07-20 19:43 ` [Buildroot] [PATCH 1/5] boot/optee-os: " Thomas Petazzoni
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2021-05-28 7:35 UTC (permalink / raw)
To: buildroot
Bump OP-TEE Examples package version to OP-TEE release 3.13.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 d43534832a..5e1839f43f 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.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
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index ca7956e5bc..484245c951 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 5/5] package/optee-test: bump to version 3.13.0
2021-05-28 7:35 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0 Etienne Carriere
` (2 preceding siblings ...)
2021-05-28 7:35 ` [Buildroot] [PATCH 4/5] package/optee-examples: " Etienne Carriere
@ 2021-05-28 7:35 ` Etienne Carriere
2021-07-20 19:43 ` [Buildroot] [PATCH 1/5] boot/optee-os: " Thomas Petazzoni
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2021-05-28 7:35 UTC (permalink / raw)
To: buildroot
Bump OP-TEE Test package version to OP-TEE release 3.13.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 0c789e1cd1..39bd68532d 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.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
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index a2d18dadfc..ed6ec3fb39 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0
2021-05-28 7:35 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0 Etienne Carriere
` (3 preceding siblings ...)
2021-05-28 7:35 ` [Buildroot] [PATCH 5/5] package/optee-test: " Etienne Carriere
@ 2021-07-20 19:43 ` Thomas Petazzoni
4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 19:43 UTC (permalink / raw)
To: buildroot
On Fri, 28 May 2021 09:35:07 +0200
Etienne Carriere <etienne.carriere@linaro.org> wrote:
> 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.
>
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> ...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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-20 19:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-28 7:35 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 3.13.0 Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 2/5] package/optee-benchmark: " Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 3/5] package/optee-client: " Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 4/5] package/optee-examples: " Etienne Carriere
2021-05-28 7:35 ` [Buildroot] [PATCH 5/5] package/optee-test: " Etienne Carriere
2021-07-20 19:43 ` [Buildroot] [PATCH 1/5] boot/optee-os: " Thomas Petazzoni
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.