* [Buildroot] [PATCH 2/5] package/optee-client: bump to version 4.0.0
2023-10-30 9:29 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Etienne Carriere
@ 2023-10-30 9:29 ` Etienne Carriere
2023-10-30 9:30 ` [Buildroot] [PATCH 3/5] package/optee-test: " Etienne Carriere
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2023-10-30 9:29 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Etienne Carriere
Bumps OP-TEE client package version to OP-TEE release 4.0.0.
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
---
package/optee-client/optee-client.hash | 4 ++--
package/optee-client/optee-client.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index 69016eae11..bb97820ab1 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.21.0/optee-client-3.21.0.tar.gz
-sha256 368164a539b85557d2079fa6cd839ec444869109f96de65d6569e58b0615d026 optee-client-3.21.0.tar.gz
+# From https://github.com/OP-TEE/optee_client/archive/4.0.0/optee-client-4.0.0.tar.gz
+sha256 bcdac9c3a9f2e93c64d114667cc6d1feddf9f978992cdc2d59745885f9bd8fbe optee-client-4.0.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 4b95842efa..99c922a171 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPTEE_CLIENT_VERSION = 3.21.0
+OPTEE_CLIENT_VERSION = 4.0.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] 6+ messages in thread* [Buildroot] [PATCH 3/5] package/optee-test: bump to version 4.0.0
2023-10-30 9:29 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Etienne Carriere
2023-10-30 9:29 ` [Buildroot] [PATCH 2/5] package/optee-client: " Etienne Carriere
@ 2023-10-30 9:30 ` Etienne Carriere
2023-10-30 9:30 ` [Buildroot] [PATCH 4/5] package/optee-examples: " Etienne Carriere
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2023-10-30 9:30 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Etienne Carriere
Bumps OP-TEE test package version to OP-TEE release 4.0.0.
Removes the local patch on OpenSSL support that has been integrated
into mainline repository before release tag 4.0.0.
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
---
...-xtest-add-DOPENSSL_API_COMPAT-10100.patch | 57 -------------------
package/optee-test/optee-test.hash | 4 +-
package/optee-test/optee-test.mk | 2 +-
3 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644 package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch
diff --git a/package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch b/package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch
deleted file mode 100644
index b876c3385f..0000000000
--- a/package/optee-test/0001-xtest-add-DOPENSSL_API_COMPAT-10100.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a0db2b60b9f5c14e9f69c0e06e1a8d35f9fb1b5a Mon Sep 17 00:00:00 2001
-From: Jerome Forissier <jerome.forissier@linaro.org>
-Date: Tue, 25 Jul 2023 14:39:25 +0200
-Subject: [PATCH] xtest: add -DOPENSSL_API_COMPAT=10100
-
-regression_1000.c uses OpenSSL functions that have been deprecated
-after version 1.1. In particular, building with version 3.0 causes the
-following error (and other similar ones not pasted here):
-
- optee_test/host/xtest/regression_1000.c: In function 'check_signature':
- optee_test/host/xtest/regression_1000.c:2735:9: error: 'SHA256_Init' is deprecated: Since OpenSSL 3.0 [-Werror=deprecated-declarations]
- 2735 | SHA256_Init(&ctx);
- | ^~~~~~~~~~~
-
-Add -DOPENSSL_API_COMPAT=10100 to the build flags to avoid this and be
-flexible with regards to which version of OpenSSL build environment has
-to provide.
-
-Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
-Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
-(cherry picked from commit cf111604c4c32a76be90f29aab25fa9b882c8715)
-Upstream: https://github.com/OP-TEE/optee_test/commit/cf111604c4c32a76be90f29aab25fa9b882c8715
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- host/xtest/CMakeLists.txt | 2 +-
- host/xtest/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/host/xtest/CMakeLists.txt b/host/xtest/CMakeLists.txt
-index 776787b..ae0f4e0 100644
---- a/host/xtest/CMakeLists.txt
-+++ b/host/xtest/CMakeLists.txt
-@@ -12,7 +12,7 @@ endif()
-
- find_package(OpenSSL)
- if(OPENSSL_FOUND)
-- add_compile_options(-DOPENSSL_FOUND=1)
-+ add_compile_options(-DOPENSSL_FOUND=1 -DOPENSSL_API_COMPAT=10100)
- set (OPENSSL_PRIVATE_LINK OpenSSL::Crypto)
- endif()
-
-diff --git a/host/xtest/Makefile b/host/xtest/Makefile
-index 8505629..2497850 100644
---- a/host/xtest/Makefile
-+++ b/host/xtest/Makefile
-@@ -39,7 +39,7 @@ endef
- # - User/group login tests 1027 and 1028
- WITH_OPENSSL ?= y
- ifeq ($(WITH_OPENSSL),y)
--CFLAGS += -DOPENSSL_FOUND=1
-+CFLAGS += -DOPENSSL_FOUND=1 -DOPENSSL_API_COMPAT=10100
- ifneq ($(OPTEE_OPENSSL_EXPORT),)
- LDFLAGS += -lcrypto
- CFLAGS += -I$(OPTEE_OPENSSL_EXPORT)
---
-2.41.0
-
diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
index 08b3331374..9744ab6d92 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.21.0/optee-test-3.21.0.tar.gz
-sha256 44c7dc3df48e9d73f12bbbef1cc2a4e22d859ab8a5e67a07923267f924175d65 optee-test-3.21.0.tar.gz
+# From https://github.com/OP-TEE/optee_test/archive/4.0.0/optee-test-4.0.0.tar.gz
+sha256 dc37b90c98db54068e61b31e20378878e2cfdf3c71f90c8a635786164651c62f optee-test-4.0.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 d306ef8269..44d3015ae1 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPTEE_TEST_VERSION = 3.21.0
+OPTEE_TEST_VERSION = 4.0.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] 6+ messages in thread* [Buildroot] [PATCH 4/5] package/optee-examples: bump to version 4.0.0
2023-10-30 9:29 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Etienne Carriere
2023-10-30 9:29 ` [Buildroot] [PATCH 2/5] package/optee-client: " Etienne Carriere
2023-10-30 9:30 ` [Buildroot] [PATCH 3/5] package/optee-test: " Etienne Carriere
@ 2023-10-30 9:30 ` Etienne Carriere
2023-10-30 9:30 ` [Buildroot] [PATCH 5/5] board/qemu/arm-vexpress-tz: fix info regarding Qemu enable=on Etienne Carriere
2023-11-01 10:36 ` [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Thomas Petazzoni via buildroot
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2023-10-30 9:30 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Etienne Carriere
Bumps OP-TEE examples package version to OP-TEE release 4.0.0.
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
---
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 c61c434c60..71cd95605d 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.21.0/optee-examples-3.21.0.tar.gz
-sha256 9b965f829adc532b5228534d3b9b38ae1fc4f2ac55d73159a39d43e59749f3ed optee-examples-3.21.0.tar.gz
+# From https://github.com/linaro-swg/optee_examples/archive/4.0.0/optee-examples-4.0.0.tar.gz
+sha256 4e21455c889ffb93085eb76f76ce191e24f394b3fa8f1d2429cad38a36e4f6e5 optee-examples-4.0.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 c182bab4cc..d620f0e36a 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPTEE_EXAMPLES_VERSION = 3.21.0
+OPTEE_EXAMPLES_VERSION = 4.0.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] 6+ messages in thread
* [Buildroot] [PATCH 5/5] board/qemu/arm-vexpress-tz: fix info regarding Qemu enable=on
2023-10-30 9:29 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Etienne Carriere
` (2 preceding siblings ...)
2023-10-30 9:30 ` [Buildroot] [PATCH 4/5] package/optee-examples: " Etienne Carriere
@ 2023-10-30 9:30 ` Etienne Carriere
2023-11-01 10:36 ` [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Thomas Petazzoni via buildroot
4 siblings, 0 replies; 6+ messages in thread
From: Etienne Carriere @ 2023-10-30 9:30 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Etienne Carriere
Since Qemu 6.0.0, a warning appear in the log if a short-form boolean
option is used. This was fixed by Romain for the main cmdline description
(see 04afe86cd7e8 ("board/qemu/arm-vexpress-tz: use enable=on")) but was
not updated in the alternate cmdlines for when using a dual console or
a GDB debug setup.
By the way, fix description mentioning qemu-system-arm command line option
-S that is an uppercase S, not a lower case s.
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
---
board/qemu/arm-vexpress-tz/readme.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt
index 3036dd54ca..3e84fe6391 100644
--- a/board/qemu/arm-vexpress-tz/readme.txt
+++ b/board/qemu/arm-vexpress-tz/readme.txt
@@ -62,7 +62,7 @@ consoles over telnet connections:
-serial telnet:127.0.0.1:1235,server \
-serial telnet:127.0.0.1:1236,server \
-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \
- -semihosting-config enable,target=native \
+ -semihosting-config enable=on,target=native \
-bios flash.bin
QEMU is now waiting for the telnet connection. From another shell, open a
@@ -91,7 +91,7 @@ From a first shell:
-smp 1 -s -m 1024 -d unimp \
-serial stdio \
-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \
- -semihosting-config enable,target=native \
+ -semihosting-config enable=on,target=native \
-bios flash.bin \
-S
@@ -123,7 +123,7 @@ Emulation has started, TF-A has loaded OP-TEE and U-boot images in memory and
has booted OP-TEE. Emulation stopped at OP-TEE core entry.
Note: QEMU hosts a GDB service listening to TCP port 1234, as set through
-qemu-system-arm command line option -s.
+qemu-system-arm command line option -S.
Note: To build the GDB server, the following extra options have to be added to
the Buildroot configuration:
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0
2023-10-30 9:29 [Buildroot] [PATCH 1/5] boot/optee-os: bump to version 4.0.0 Etienne Carriere
` (3 preceding siblings ...)
2023-10-30 9:30 ` [Buildroot] [PATCH 5/5] board/qemu/arm-vexpress-tz: fix info regarding Qemu enable=on Etienne Carriere
@ 2023-11-01 10:36 ` Thomas Petazzoni via buildroot
4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-01 10:36 UTC (permalink / raw)
To: Etienne Carriere; +Cc: Romain Naour, buildroot
On Mon, 30 Oct 2023 10:29:58 +0100
Etienne Carriere <etienne.carriere@foss.st.com> wrote:
> Bumps OP-TEE OS package version to OP-TEE release 4.0.0.
>
> Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
> ---
> boot/optee-os/Config.in | 4 ++--
> boot/optee-os/optee-os.hash | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
Thanks Etienne, entire series applied to master!
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread