configs/qemu_arm_vexpress_tz_defconfig: enable CXX toolchain
PATCH 1/8 configs/qemu_arm_vexpress_tz_defconfig: enable CXX toolchain
Enable C++ toolchain that is needed to build some OP-TEE test trusted applications once OP-TEE packages bump to release 3.11.0.
--- configs/qemu_arm_vexpress_tz_defconfig | 3 +++ 1 file changed, 3 insertions(+)
configs/qemu_arm_vexpress_tz_defconfig +3 -0
@@ -51,3 +51,6 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y + +# optee-test needs toolchain C++ +BR2_TOOLCHAIN_BUILDROOT_CXX=y
Signature · 1 line
2.17.1
PATCH 2/8 boot/optee-os: bump to version 3.11.0
Bump OP-TEE OS package version to OP-TEE release 3.11.0.
Remove patches since merged in OP-TEE OS 3.11.0
--- ...ub.py-use-Cryptodome-module-instead-.patch | 34 --- ...nfig.mk-fix-CFG_OPTEE_REVISION_MINOR.patch | 32 --- ...e-ta-Configurable-Python-interpreter.patch | 249 ------------------ boot/optee-os/Config.in | 4 +- boot/optee-os/optee-os.hash | 4 +- 5 files changed, 4 insertions(+), 319 deletions(-) delete mode 100644 boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch delete mode 100644 boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch delete mode 100644 boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch
boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 04a8def18caccad27292ba97dc8ea8b3eb3a6afd Mon Sep 17 00:00:00 2001 -From: Etienne Carriere <[email protected]> -Date: Tue, 26 May 2020 11:10:45 +0200 -Subject: [PATCH] scripts/pem_to_pub.py: use Cryptodome module instead of - Crypto - -Upgrade scripts/pem_to_pub.py to use module Cryptodome instead of -module Crypto for consistency with the other helper Python scripts -of OP-TEE OS package. - -Signed-off-by: Etienne Carriere <[email protected]> -Acked-by: Jens Wiklander <[email protected]> ---- - scripts/pem_to_pub_c.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/pem_to_pub_c.py b/scripts/pem_to_pub_c.py -index 3a896a393..d3f0e5006 100755 ---- a/scripts/pem_to_pub_c.py -+++ b/scripts/pem_to_pub_c.py -@@ -21,8 +21,8 @@ def get_args(): - - def main(): - import array -- from Crypto.PublicKey import RSA -- from Crypto.Util.number import long_to_bytes -+ from Cryptodome.PublicKey import RSA -+ from Cryptodome.Util.number import long_to_bytes - - args = get_args() - --- -2.17.1 -
boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From c5f5e6bf6644a536a0d53bfb9f5c5419150035dd Mon Sep 17 00:00:00 2001 -From: Jens Wiklander <[email protected]> -Date: Mon, 25 May 2020 12:20:08 +0200 -Subject: [PATCH] config.mk: fix CFG_OPTEE_REVISION_MINOR - -The current release is 3.9.0, change the revision to match. - -Fixes: af141c61fe7a ("Update CHANGELOG for 3.9.0") -Reviewed-by: Joakim Bech <[email protected]> -Reported-by: Etienne Carriere <[email protected]> -Signed-off-by: Jens Wiklander <[email protected]> -Signed-off-by: Etienne Carriere <[email protected]> ---- - mk/config.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mk/config.mk b/mk/config.mk -index c00a14618..bc49f83d8 100644 ---- a/mk/config.mk -+++ b/mk/config.mk -@@ -116,7 +116,7 @@ endif - # with limited depth not including any tag, so there is really no guarantee - # that TEE_IMPL_VERSION contains the major and minor revision numbers. - CFG_OPTEE_REVISION_MAJOR ?= 3 --CFG_OPTEE_REVISION_MINOR ?= 8 -+CFG_OPTEE_REVISION_MINOR ?= 9 - - # Trusted OS implementation manufacturer name - CFG_TEE_MANUFACTURER ?= LINARO --- -2.17.1 -
boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch deleted +0 -249
249 lines not on this page · raw message
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.9.0" + bool "3.11.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.9.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.11.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.9.0.tar.gz -sha256 ac6f145ebde715d4d7a1d5277f4e08a06b660e1c0237c926a274d86cd90ef4c5 optee-os-3.9.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.11.0.tar.gz +sha256 3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb optee-os-3.11.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
Signature · 1 line
2.17.1
PATCH 3/8 package/optee-client: bump to version 3.11.0
In reply to Etienne CarriereBump OP-TEE Client package version to OP-TEE release 3.11.0. Remove local patch file since issue addressed since.
--- ...teec-CMakeLists.txt-fix-static-build.patch | 55 ------------------- package/optee-client/optee-client.hash | 4 +- package/optee-client/optee-client.mk | 2 +- 3 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 package/optee-client/0001-libckteec-CMakeLists.txt-fix-static-build.patch
package/optee-client/0001-libckteec-CMakeLists.txt-fix-static-build.patch deleted +0 -55
@@ -1,55 +0,0 @@ -From dedd04034fd246c5726ad875e8207c821e9471b7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Wed, 15 Jul 2020 00:09:21 +0200 -Subject: [PATCH] libckteec/CMakeLists.txt: fix static build - -Remove SHARED from add_library call to avoid the following build failure -when the toolchain does not support shared library: - -[ 78%] Linking C shared library libckteec.so -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(close.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(close.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(close.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(open64.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(libc-cancellation.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(libc-cancellation.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(open.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(open.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux[ 84%] Building C object tee-supplicant/CMakeFiles/tee-supplicant.dir/src/teec_ta_load.c.o --uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(open.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-3/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__syscall_fcntl.os)(.eh_frame) prevents .eh_frame_hdr table being created -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: further warnings about FDE encoding preventing .eh_frame_hdr generation dropped -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: BFD (GNU Binutils) 2.33.1 assertion fail elf32-microblaze.c:1542 -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/crtbeginT.o: probably compiled without -fPIC? -/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: final link failed: bad value -collect2: error: ld returned 1 exit status -libckteec/CMakeFiles/ckteec.dir/build.make:144: recipe for target 'libckteec/libckteec.so.0.1.0' failed - -This build failure is raised on version 3.9.0 since -https://github.com/ffontaine/optee_client/commit/fa679fc6f1f0c6240513ec69c63f0f89c2c4dd99 - -Fixes: - - http://autobuild.buildroot.org/results/fe2d0f5a956bf23635e51258f92d9ab2e5af7941 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/OP-TEE/optee_client/pull/215] ---- - libckteec/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libckteec/CMakeLists.txt b/libckteec/CMakeLists.txt -index f0e14d1..615c9fe 100644 ---- a/libckteec/CMakeLists.txt -+++ b/libckteec/CMakeLists.txt -@@ -33,7 +33,7 @@ set (SRC - ################################################################################ - # Built library - ################################################################################ --add_library (ckteec SHARED ${SRC}) -+add_library (ckteec ${SRC}) - - set_target_properties (ckteec PROPERTIES - VERSION ${PROJECT_VERSION} --- -2.27.0 -
package/optee-client/optee-client.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.9.0.tar.gz -sha256 1b072e6be8a697656e9fe34499789bbd4132b3720f8d1b95c659e8e6c5873654 optee-client-3.9.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.11.0.tar.gz +sha256 91f8ec191cd999ee666b6203ec376415d5dc90a8a9955f3d5fce1f48df77169b optee-client-3.11.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
package/optee-client/optee-client.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.9.0 +OPTEE_CLIENT_VERSION = 3.11.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/8 package/optee-examples: bump to version 3.11.0
In reply to Etienne CarriereBump OP-TEE Exmaples package version to OP-TEE release 3.11.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.9.0.tar.gz -sha256 deb5161ac9b9c1bf12963d28992e3941452a78bcbd518169b53c0798393eb386 optee-examples-3.9.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.11.0.tar.gz +sha256 b910479a2d432014b6c49aafed27e26dd6f930e7c31d277c1500c1b60b4b3876 optee-examples-3.11.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE
package/optee-examples/optee-examples.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.9.0 +OPTEE_EXAMPLES_VERSION = 3.11.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/8 package/optee-benchmark: bump to version 3.11.0
In reply to Etienne CarriereBump OP-TEE Benchmark package version to OP-TEE release 3.11.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.9.0.tar.gz -sha256 84ea29c74de8cba99022f411a7c12451a9b8b71da608aa2ce75a975296ea1e3f optee-benchmark-3.9.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.11.0.tar.gz +sha256 34c314a5cda1e9e3b92f01759585722b44503d9eea19f6b936fc951f5acbac16 optee-benchmark-3.11.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE
package/optee-benchmark/optee-benchmark.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.9.0 +OPTEE_BENCHMARK_VERSION = 3.11.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 6/8 package/optee-test: bump to version 3.11.0
In reply to Etienne CarriereBump OP-TEE Test package version to OP-TEE release 3.11.0. Add dependency on BR2_INSTALL_LIBSTDCPP since C++ support is needed to build some OP-TEE test trusted applications.
Remove local patch files since issues addressed since.
--- ...-xtest-fix-generic-argument-handling.patch | 32 ------------- ...-1027-1028-skip-tests-when-test-leve.patch | 47 ------------------- package/optee-test/Config.in | 6 ++- package/optee-test/optee-test.hash | 4 +- package/optee-test/optee-test.mk | 2 +- 5 files changed, 7 insertions(+), 84 deletions(-) delete mode 100644 package/optee-test/0001-xtest-fix-generic-argument-handling.patch delete mode 100644 package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch
package/optee-test/0001-xtest-fix-generic-argument-handling.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From e1af176af2bb274745e9b0d43456763f8946f107 Mon Sep 17 00:00:00 2001 -From: Etienne Carriere <[email protected]> -Date: Mon, 25 May 2020 13:09:59 +0200 -Subject: [PATCH] xtest: fix generic argument handling - -Fix position of last generic argument badly handled that makes -d, -l or --t argument being treated also as if it was the first test ID to consider -in the filtered test IDs list. - -Fixes: 66542a1bb4e0 ("xtest: exclude tests with -x") -Signed-off-by: Etienne Carriere <[email protected]> -Acked-by: Jerome Forissier <[email protected]> ---- - host/xtest/xtest_main.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/host/xtest/xtest_main.c b/host/xtest/xtest_main.c -index 3dff2fe..1e566fa 100644 ---- a/host/xtest/xtest_main.c -+++ b/host/xtest/xtest_main.c -@@ -188,8 +188,6 @@ int main(int argc, char *argv[]) - } - } - next: -- if (last_gen_option > 1) -- last_gen_option--; - - for (index = last_gen_option; index < argc; index++) { - if (!strcmp(argv[index], "-x")) { --- -2.17.1 -
package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch deleted +0 -47
47 lines not on this page · raw message
package/optee-test/Config.in +4 -2
@@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help
@@ -22,6 +23,7 @@ config BR2_PACKAGE_OPTEE_TEST http://github.com/OP-TEE/optee_test -comment "optee-test needs a toolchain w/ threads" +comment "optee-test needs a toolchain w/ threads and C++" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREAD + depends on !BR2_INSTALL_LIBSTDCPP
package/optee-test/optee-test.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.9.0.tar.gz -sha256 59be1c97cdef7a886bdf4c50f7bf86354be68a68f6ffd43cd5ce4bb96156f402 optee-test-3.9.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.11.0.tar.gz +sha256 54d4b7e2ad22cd409ee8e25e990c1878690b1b5eb8843f649d12022888186a53 optee-test-3.11.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.9.0 +OPTEE_TEST_VERSION = 3.11.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 6/8 package/optee-test: bump to version 3.11.0
package/optee-test/Config.in config BR2_PACKAGE_OPTEE_TEST · line 28
Quoted 2 lines · On Fri, 30 Oct 2020 08:50:43 +0100 Etienne Carriere…
package/optee-test/Config.in +1
-1- depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREAD
You introduced a typo here by dropping the S.
package/optee-test/Config.in config BR2_PACKAGE_OPTEE_TEST · line 29
Quoted 1 line
package/optee-test/Config.in +1
-0+ depends on !BR2_INSTALL_LIBSTDCPP
And this should have been:
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
indeed, the way you had written the conditions, the comment would only displayed if the toolchain does not have threads *and* does not have C++. But what we want is the comment to appear when the toolchain does not have threads *or* does not have C++.
I fixed that up when applying. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 6/8 package/optee-test: bump to version 3.11.0
Quoted 13 lines · Thomas Petazzoni
package/optee-test/Config.in config BR2_PACKAGE_OPTEE_TEST · line 28
Quoted 2 lines · On Fri, 30 Oct 2020 08:50:43 +0100 Etienne Carriere…
package/optee-test/Config.in +1
-1- depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADYou introduced a typo here by dropping the S.
Quoted 1 line
+ depends on !BR2_INSTALL_LIBSTDCPP
And this should have been:
Quoted 8 lines
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPPindeed, the way you had written the conditions, the comment would only displayed if the toolchain does not have threads *and* does not have C++. But what we want is the comment to appear when the toolchain does not have threads *or* does not have C++.
I fixed that up when applying. Thanks!
Understood.
Thanks for the fixes and for applying the changes.
Regards,
Etienne
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
PATCH 7/8 package/optee-test: add deps on openssl when enabled
In reply to Etienne CarriereAdd a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to enable some for OP-TEE embedded tests.
--- package/optee-test/optee-test.mk | 3 +++ 1 file changed, 3 insertions(+)
package/optee-test/optee-test.mk +3 -0
@@ -10,6 +10,9 @@ OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +OPTEE_TEST_DEPENDENCIES += openssl +endif OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK)
Signature · 1 line
2.17.1
PATCH 7/8 package/optee-test: add deps on openssl when enabled
Hello ?tienne,
Quoted 2 lines · On Fri, 30 Oct 2020 08:50:44 +0100 Etienne Carriere…
OPTEE_TEST_DEPENDENCIES= optee-client optee-os
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
Is it intentional that the dependency is on BR2_PACKAGE_LIBOPENSSL and not BR2_PACKAGE_OPENSSL ?
If you use BR2_PACKAGE_OPENSSL, it means that either openssl or libressl can be used. If you use BR2_PACKAGE_LIBOPENSSL, then it means that you really only support working with openssl.
Normally, libressl is a drop-in replacement for openssl, so it does work just like openssl in most cases. There are however a few OpenSSL APIs that are no longer supported in LibreSSL.
Could you clarify this point ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 7/8 package/optee-test: add deps on openssl when enabled
Hello Thomas,
Quoted 16 lines · Thomas Petazzoni
Hello ?tienne,
Quoted 2 lines · On Fri, 30 Oct 2020 08:50:44 +0100 Etienne Carriere…
OPTEE_TEST_DEPENDENCIES= optee-client optee-os
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)Is it intentional that the dependency is on
BR2_PACKAGE_LIBOPENSSLand notBR2_PACKAGE_OPENSSL?If you use
BR2_PACKAGE_OPENSSL, it means that either openssl or libressl can be used. If you useBR2_PACKAGE_LIBOPENSSL, then it means that you really only support working with openssl.
Quoted 5 lines
Normally, libressl is a drop-in replacement for openssl, so it does work just like openssl in most cases. There are however a few OpenSSL APIs that are no longer supported in LibreSSL.
Could you clarify this point ?
Thanks for highlighting this. Indeed, constraining to libopenssl was not intentional.
I've checked. From my reading, I would think optee-test uses standard stuff from openssl that libressl supports but
testing here with libressl makes the optee-test test tool fail on a certificate test.
I guess this should be investigated from the optee project scope. As for now I'd rather stick to BR2_PACKAGE_LIBOPENSSL dependency here as this change proposes.
Regards,
Etienne
Quoted 8 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Yann E. MORIN
AppliedPATCH 7/8 package/optee-test: add deps on openssl when enabled
In reply to Etienne Carriere?tienne, All,
On 2020-10-30 08:50 +0100, Etienne Carriere spake thusly:
Quoted 4 lines
Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to enable some for OP-TEE embedded tests.
Signed-off-by Etienne Carriere <[email protected]>
Applied to next, with the following changes:
- match the depenency to libopenssl, since that's is what is used in the condition (BR2_PACKAGE_LIBOPENSSL)
- add a blurb to explain why libopenssl is used, not the virutal openssl
Thanks!
BTW, there are openssl headers and a pre-built libcrypto.a for arm and AArch64 in optee-test 3.12.0. Was that intentional?
Regards,
Yann E. MORIN.
Quoted 25 lines
--- package/optee-test/optee-test.mk | 3 +++ 1 file changed, 3 insertions(+)package/optee-test/optee-test.mk +3
-0@@ -10,6 +10,9 @@ OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +OPTEE_TEST_DEPENDENCIES += openssl +endif OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK)Signature · 6 lines
2.17.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 7/8 package/optee-test: add deps on openssl when enabled
Hi,
J?r?me in copy, from the optee_test.git maintainers.
Quoted 16 lines · Yann E. MORIN
?tienne, All,
On 2020-10-30 08:50 +0100, Etienne Carriere spake thusly:
Quoted 4 lines
Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to enable some for OP-TEE embedded tests.
Signed-off-by Etienne Carriere <[email protected]>Applied to next, with the following changes:
- match the depenency to libopenssl, since that's is what is used in the condition (
BR2_PACKAGE_LIBOPENSSL)
- add a blurb to explain why libopenssl is used, not the virutal openssl
Quoted 4 lines
Thanks!
BTW, there are openssl headers and a pre-built libcrypto.a for arm and AArch64 in optee-test 3.12.0. Was that intentional?
That's an ugly hack (sorry j?r?me) for when build env is missing an openssl. Since the build env proposed in OP-TEE release, maybe we don't need them anymore.
J?r?me, do you think we still need the repbuilt openssl libs in optee_test?
br,
etienne
Quoted 37 lines
Regards,
Yann E. MORIN.Quoted 21 lines
--- package/optee-test/optee-test.mk | 3 +++ 1 file changed, 3 insertions(+)package/optee-test/optee-test.mk +3
-1@@ -10,6 +10,9 @@ OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +OPTEE_TEST_DEPENDENCIES += openssl +endif OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) --2.17.1
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/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. |'------------------------------^-------^------------------^--------------------'
PATCH 7/8 package/optee-test: add deps on openssl when enabled
In reply to Yann E. MORINQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
?tienne, All,
On 2020-10-30 08:50 +0100, Etienne Carriere spake thusly:Quoted 3 lines
Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to enable some for OP-TEE embedded tests.
Quoted 8 lines
Quoted 1 line
Signed-off-by Etienne Carriere <[email protected]>Applied to next, with the following changes:
- match the depenency to libopenssl, since that's is what is used in the condition (
BR2_PACKAGE_LIBOPENSSL)
- add a blurb to explain why libopenssl is used, not the virutal openssl
Committed to 2021.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 8/8 configs/qemu_arm_vexpress_tz_defconfig: embed openssl library
In reply to Etienne CarriereEmbed openssl library to enable some OP-TEE tests that relies on it.
--- configs/qemu_arm_vexpress_tz_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
configs/qemu_arm_vexpress_tz_defconfig +4 -0
@@ -54,3 +54,7 @@ BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y # optee-test needs toolchain C++ BR2_TOOLCHAIN_BUILDROOT_CXX=y + +# Embed OpenSSL library for some optee-test tests +BR2_PACKAGE_OPENSSL=y +BR2_PACKAGE_LIBOPENSSL=y
Signature · 1 line
2.17.1
Thomas Petazzoni
AppliedPATCH 8/8 configs/qemu_arm_vexpress_tz_defconfig: embed openssl library
Quoted 6 lines · On Fri, 30 Oct 2020 08:50:45 +0100 Etienne Carriere…
Embed openssl library to enable some OP-TEE tests that relies on it.
Signed-off-by Etienne Carriere <[email protected]>--- configs/qemu_arm_vexpress_tz_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/8 configs/qemu_arm_vexpress_tz_defconfig: enable CXX toolchain
In reply to Etienne CarriereQuoted 7 lines · On Fri, 30 Oct 2020 08:50:38 +0100 Etienne Carriere…
Enable C++ toolchain that is needed to build some OP-TEE test trusted applications once OP-TEE packages bump to release 3.11.0.
Signed-off-by Etienne Carriere <[email protected]>--- configs/qemu_arm_vexpress_tz_defconfig | 3 +++ 1 file changed, 3 insertions(+)
Thanks, I have applied patches 1 to 6 in this series. I have asked a question on PATCH 7/8 though, so I haven't applied 7/8 and 8/8.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com