[Buildroot] [PATCH 1/8] configs/qemu_arm_vexpress_tz_defconfig: enable CXX toolchain

[Buildroot] [PATCH 1/8] configs/qemu_arm_vexpress_tz_defconfig: enable CXX toolchain

[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 <etienne.carriere@linaro.org>
---
 configs/qemu_arm_vexpress_tz_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig
index 815a7987ca..66ce636ce0 100644
--- a/configs/qemu_arm_vexpress_tz_defconfig
+++ b/configs/qemu_arm_vexpress_tz_defconfig
@@ -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
-- 
2.17.1

[Buildroot] [PATCH 2/8] boot/optee-os: bump to version 3.11.0

[Etienne Carriere]

Bump OP-TEE OS package version to OP-TEE release 3.11.0.

Remove patches since merged in OP-TEE OS 3.11.0

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 ...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

diff --git a/boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch b/boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch
deleted file mode 100644
index 822ef4b39e..0000000000
--- a/boot/optee-os/0001-scripts-pem_to_pub.py-use-Cryptodome-module-instead-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 04a8def18caccad27292ba97dc8ea8b3eb3a6afd Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-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 <etienne.carriere@linaro.org>
-Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
----
- 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
-
diff --git a/boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch b/boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch
deleted file mode 100644
index 867836ef0c..0000000000
--- a/boot/optee-os/0002-config.mk-fix-CFG_OPTEE_REVISION_MINOR.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c5f5e6bf6644a536a0d53bfb9f5c5419150035dd Mon Sep 17 00:00:00 2001
-From: Jens Wiklander <jens.wiklander@linaro.org>
-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 <joakim.bech@linaro.org>
-Reported-by: Etienne Carriere <etienne.carriere@linaro.org>
-Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- 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
-
diff --git a/boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch b/boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch
deleted file mode 100644
index 911a09b986..0000000000
--- a/boot/optee-os/0003-mk-core-ta-Configurable-Python-interpreter.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 49c7d2557d92993a1e09e50c961b9d4f7ab1091b Mon Sep 17 00:00:00 2001
-From: Dick Olsson <hi@senzilla.io>
-Date: Wed, 22 Jul 2020 08:49:12 +0200
-Subject: [PATCH] mk: core: ta: Configurable Python interpreter
-
-Build systems that manage multiple different python interpreters need
-explicit control over which version of the interpreter to use.
-This patch enables one to override the default interpreter with the path
-to a specific one.
-
-Signed-off-by: Dick Olsson <hi@senzilla.io>
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-Reviewed-by: Jerome Forissier <jerome@forissier.org>
----
- core/arch/arm/arm.mk         |  2 ++
- core/arch/arm/kernel/link.mk | 22 +++++++++++-----------
- core/sub.mk                  | 10 +++++-----
- mk/config.mk                 |  6 ++++++
- mk/lib.mk                    |  2 +-
- ta/arch/arm/link.mk          |  2 +-
- ta/arch/arm/link_shlib.mk    |  2 +-
- ta/ta.mk                     |  2 +-
- 8 files changed, 28 insertions(+), 20 deletions(-)
-
-diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk
-index 5c9f16ef..878035c5 100644
---- a/core/arch/arm/arm.mk
-+++ b/core/arch/arm/arm.mk
-@@ -245,6 +245,7 @@ ta-mk-file-export-add-ta_arm32 += CROSS_COMPILE32 ?= $$(CROSS_COMPILE)_nl_
- ta-mk-file-export-add-ta_arm32 += CROSS_COMPILE_ta_arm32 ?= $$(CROSS_COMPILE32)_nl_
- ta-mk-file-export-add-ta_arm32 += COMPILER ?= gcc_nl_
- ta-mk-file-export-add-ta_arm32 += COMPILER_ta_arm32 ?= $$(COMPILER)_nl_
-+ta-mk-file-export-add-ta_arm32 += PYTHON3 ?= python3_nl_
- endif
- 
- ifneq ($(filter ta_arm64,$(ta-targets)),)
-@@ -275,6 +276,7 @@ ta-mk-file-export-add-ta_arm64 += CROSS_COMPILE64 ?= $$(CROSS_COMPILE)_nl_
- ta-mk-file-export-add-ta_arm64 += CROSS_COMPILE_ta_arm64 ?= $$(CROSS_COMPILE64)_nl_
- ta-mk-file-export-add-ta_arm64 += COMPILER ?= gcc_nl_
- ta-mk-file-export-add-ta_arm64 += COMPILER_ta_arm64 ?= $$(COMPILER)_nl_
-+ta-mk-file-export-add-ta_arm64 += PYTHON3 ?= python3_nl_
- endif
- 
- # Set cross compiler prefix for each TA target
-diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk
-index 1b89b895..69375ad6 100644
---- a/core/arch/arm/kernel/link.mk
-+++ b/core/arch/arm/kernel/link.mk
-@@ -62,13 +62,13 @@ cleanfiles += $(link-out-dir)/text_unpaged.ld.S
- $(link-out-dir)/text_unpaged.ld.S: $(link-out-dir)/unpaged.o
- 	@$(cmd-echo-silent) '  GEN     $@'
- 	$(q)$(READELFcore) -S -W $< | \
--		./scripts/gen_ld_sects.py .text. > $@
-+		$(PYTHON3) ./scripts/gen_ld_sects.py .text. > $@
- 
- cleanfiles += $(link-out-dir)/rodata_unpaged.ld.S
- $(link-out-dir)/rodata_unpaged.ld.S: $(link-out-dir)/unpaged.o
- 	@$(cmd-echo-silent) '  GEN     $@'
- 	$(q)$(READELFcore) -S -W $< | \
--		./scripts/gen_ld_sects.py .rodata. > $@
-+		$(PYTHON3) ./scripts/gen_ld_sects.py .rodata. > $@
- 
- 
- cleanfiles += $(link-out-dir)/init_entries.txt
-@@ -92,12 +92,12 @@ cleanfiles += $(link-out-dir)/text_init.ld.S
- $(link-out-dir)/text_init.ld.S: $(link-out-dir)/init.o
- 	@$(cmd-echo-silent) '  GEN     $@'
- 	$(q)$(READELFcore) -S -W $< | \
--		./scripts/gen_ld_sects.py .text. > $@
-+		$(PYTHON3) ./scripts/gen_ld_sects.py .text. > $@
- 
- cleanfiles += $(link-out-dir)/rodata_init.ld.S
- $(link-out-dir)/rodata_init.ld.S: $(link-out-dir)/init.o
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)$(READELFcore) -S -W $< | ./scripts/gen_ld_sects.py .rodata. > $@
-+	$(q)$(READELFcore) -S -W $< | $(PYTHON3) ./scripts/gen_ld_sects.py .rodata. > $@
- 
- -include $(link-script-dep)
- 
-@@ -176,39 +176,39 @@ cleanfiles += $(link-out-dir)/tee-pager.bin
- $(link-out-dir)/tee-pager.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py
- 	@echo Warning: $@ is deprecated
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)scripts/gen_tee_bin.py --input $< --out_tee_pager_bin $@
-+	$(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_tee_pager_bin $@
- 
- cleanfiles += $(link-out-dir)/tee-pageable.bin
- $(link-out-dir)/tee-pageable.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py
- 	@echo Warning: $@ is deprecated
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)scripts/gen_tee_bin.py --input $< --out_tee_pageable_bin $@
-+	$(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_tee_pageable_bin $@
- 
- all: $(link-out-dir)/tee.bin
- cleanfiles += $(link-out-dir)/tee.bin
- $(link-out-dir)/tee.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)scripts/gen_tee_bin.py --input $< --out_tee_bin $@
-+	$(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_tee_bin $@
- 
- all: $(link-out-dir)/tee-header_v2.bin
- cleanfiles += $(link-out-dir)/tee-header_v2.bin
- $(link-out-dir)/tee-header_v2.bin: $(link-out-dir)/tee.elf \
- 				   scripts/gen_tee_bin.py
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)scripts/gen_tee_bin.py --input $< --out_header_v2 $@
-+	$(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_header_v2 $@
- 
- all: $(link-out-dir)/tee-pager_v2.bin
- cleanfiles += $(link-out-dir)/tee-pager_v2.bin
- $(link-out-dir)/tee-pager_v2.bin: $(link-out-dir)/tee.elf scripts/gen_tee_bin.py
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)scripts/gen_tee_bin.py --input $< --out_pager_v2 $@
-+	$(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_pager_v2 $@
- 
- all: $(link-out-dir)/tee-pageable_v2.bin
- cleanfiles += $(link-out-dir)/tee-pageable_v2.bin
- $(link-out-dir)/tee-pageable_v2.bin: $(link-out-dir)/tee.elf \
- 				     scripts/gen_tee_bin.py
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)scripts/gen_tee_bin.py --input $< --out_pageable_v2 $@
-+	$(q)$(PYTHON3) scripts/gen_tee_bin.py --input $< --out_pageable_v2 $@
- 
- all: $(link-out-dir)/tee.symb_sizes
- cleanfiles += $(link-out-dir)/tee.symb_sizes
-@@ -222,5 +222,5 @@ mem_usage: $(link-out-dir)/tee.mem_usage
- 
- $(link-out-dir)/tee.mem_usage: $(link-out-dir)/tee.elf
- 	@$(cmd-echo-silent) '  GEN     $@'
--	$(q)./scripts/mem_usage.py $< > $@
-+	$(q)$(PYTHON3) ./scripts/mem_usage.py $< > $@
- endif
-diff --git a/core/sub.mk b/core/sub.mk
-index 03cc6bc7..0959c9a9 100644
---- a/core/sub.mk
-+++ b/core/sub.mk
-@@ -9,13 +9,13 @@ ifeq ($(CFG_WITH_USER_TA),y)
- gensrcs-y += ta_pub_key
- produce-ta_pub_key = ta_pub_key.c
- depends-ta_pub_key = $(TA_SIGN_KEY) scripts/pem_to_pub_c.py
--recipe-ta_pub_key = scripts/pem_to_pub_c.py --prefix ta_pub_key \
-+recipe-ta_pub_key = $(PYTHON3) scripts/pem_to_pub_c.py --prefix ta_pub_key \
- 		--key $(TA_SIGN_KEY) --out $(sub-dir-out)/ta_pub_key.c
- 
- gensrcs-y += ldelf
- produce-ldelf = ldelf_hex.c
- depends-ldelf = scripts/gen_ldelf_hex.py $(out-dir)/ldelf/ldelf.elf
--recipe-ldelf = scripts/gen_ldelf_hex.py --input $(out-dir)/ldelf/ldelf.elf \
-+recipe-ldelf = $(PYTHON3) scripts/gen_ldelf_hex.py --input $(out-dir)/ldelf/ldelf.elf \
- 			--output $(sub-dir-out)/ldelf_hex.c
- endif
- 
-@@ -25,7 +25,7 @@ early-ta-$1-uuid := $(firstword $(subst ., ,$(notdir $1)))
- gensrcs-y += early-ta-$1
- produce-early-ta-$1 = early_ta_$$(early-ta-$1-uuid).c
- depends-early-ta-$1 = $1 scripts/ta_bin_to_c.py
--recipe-early-ta-$1 = scripts/ta_bin_to_c.py --compress --ta $1 \
-+recipe-early-ta-$1 = $(PYTHON3) scripts/ta_bin_to_c.py --compress --ta $1 \
- 		--out $(sub-dir-out)/early_ta_$$(early-ta-$1-uuid).c
- endef
- $(foreach f, $(EARLY_TA_PATHS), $(eval $(call process_early_ta,$(f))))
-@@ -40,7 +40,7 @@ core-embed-fdt-c = $(out-dir)/$(arch-dir)/dts/$(CFG_EMBED_DTB_SOURCE_FILE:.dts=.
- gensrcs-y += embedded_secure_dtb
- produce-embedded_secure_dtb = arch/$(ARCH)/dts/$(CFG_EMBED_DTB_SOURCE_FILE:.dts=.c)
- depends-embedded_secure_dtb = $(core-embed-fdt-dtb) scripts/bin_to_c.py
--recipe-embedded_secure_dtb = scripts/bin_to_c.py \
-+recipe-embedded_secure_dtb = $(PYTHON3) scripts/bin_to_c.py \
- 				--bin $(core-embed-fdt-dtb) \
- 				--vname embedded_secure_dtb \
- 				--out $(core-embed-fdt-c)
-@@ -58,7 +58,7 @@ $(conf-mk-xz-base64): $(conf-mk-file)
- gensrcs-y += conf_str
- produce-conf_str = conf.mk.xz.base64.c
- depends-conf_str = $(conf-mk-xz-base64)
--recipe-conf_str = scripts/bin_to_c.py --text --bin $(conf-mk-xz-base64) \
-+recipe-conf_str = $(PYTHON3) scripts/bin_to_c.py --text --bin $(conf-mk-xz-base64) \
- 			--out $(sub-dir-out)/conf.mk.xz.base64.c \
- 			--vname conf_str
- endif
-diff --git a/mk/config.mk b/mk/config.mk
-index 70732c4d..1fe65576 100644
---- a/mk/config.mk
-+++ b/mk/config.mk
-@@ -32,6 +32,12 @@ endif
- # Supported values: undefined, 1, 2 and 3. 3 gives more warnings.
- WARNS ?= 3
- 
-+# Path to the Python interpreter used by the build system.
-+# This variable is set to the default python3 interpreter in the user's
-+# path. But build environments that require more explicit control can
-+# set the path to a specific interpreter through this variable.
-+PYTHON3 ?= python3
-+
- # Define DEBUG=1 to compile without optimization (forces -O0)
- # DEBUG=1
- 
-diff --git a/mk/lib.mk b/mk/lib.mk
-index 6e890893..3bd422d6 100644
---- a/mk/lib.mk
-+++ b/mk/lib.mk
-@@ -72,7 +72,7 @@ $(lib-shlibstrippedfile): $(lib-shlibfile)
- 
- $(lib-shlibtafile): $(lib-shlibstrippedfile) $(TA_SIGN_KEY)
- 	@$(cmd-echo-silent) '  SIGN    $$@'
--	$$(q)$$(SIGN) --key $(TA_SIGN_KEY) --uuid $(libuuid) --in $$< --out $$@
-+	$$(q)$$(PYTHON3) $$(SIGN) --key $(TA_SIGN_KEY) --uuid $(libuuid) --in $$< --out $$@
- 
- $(lib-libuuidln): $(lib-shlibfile)
- 	@$(cmd-echo-silent) '  LN      $$@'
-diff --git a/ta/arch/arm/link.mk b/ta/arch/arm/link.mk
-index db7d0b9a..b95c0cba 100644
---- a/ta/arch/arm/link.mk
-+++ b/ta/arch/arm/link.mk
-@@ -2,7 +2,7 @@ link-script$(sm) = $(ta-dev-kit-dir$(sm))/src/ta.ld.S
- link-script-pp$(sm) = $(link-out-dir$(sm))/ta.lds
- link-script-dep$(sm) = $(link-out-dir$(sm))/.ta.ld.d
- 
--SIGN_ENC ?= $(ta-dev-kit-dir$(sm))/scripts/sign_encrypt.py
-+SIGN_ENC ?= $(PYTHON3) $(ta-dev-kit-dir$(sm))/scripts/sign_encrypt.py
- TA_SIGN_KEY ?= $(ta-dev-kit-dir$(sm))/keys/default_ta.pem
- 
- ifeq ($(CFG_ENCRYPT_TA),y)
-diff --git a/ta/arch/arm/link_shlib.mk b/ta/arch/arm/link_shlib.mk
-index ed81e59a..cc177ef0 100644
---- a/ta/arch/arm/link_shlib.mk
-+++ b/ta/arch/arm/link_shlib.mk
-@@ -47,5 +47,5 @@ $(link-out-dir)/$(shlibuuid).elf: $(link-out-dir)/$(shlibname).so
- $(link-out-dir)/$(shlibuuid).ta: $(link-out-dir)/$(shlibname).stripped.so \
- 				$(TA_SIGN_KEY)
- 	@$(cmd-echo-silent) '  SIGN    $@'
--	$(q)$(SIGN) --key $(TA_SIGN_KEY) --uuid $(shlibuuid) \
-+	$(q)$(PYTHON3) $(SIGN) --key $(TA_SIGN_KEY) --uuid $(shlibuuid) \
- 		--in $< --out $@
-diff --git a/ta/ta.mk b/ta/ta.mk
-index 918880f4..59ed87f7 100644
---- a/ta/ta.mk
-+++ b/ta/ta.mk
-@@ -67,7 +67,7 @@ $$(arm32-user-sysregs-out)/$$(arm32-user-sysregs-$(1)-h): \
- 		$(1) scripts/arm32_sysreg.py
- 	@$(cmd-echo-silent) '  GEN     $$@'
- 	$(q)mkdir -p $$(dir $$@)
--	$(q)scripts/arm32_sysreg.py --guard __$$(arm32-user-sysregs-$(1)-h) \
-+	$(q)$(PYTHON3) scripts/arm32_sysreg.py --guard __$$(arm32-user-sysregs-$(1)-h) \
- 		< $$< > $$@
- 
- endef #process-arm32-user-sysreg
--- 
-2.20.1
-
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 5a786833ef..3076be6b42 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.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
 
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
index f38ebc569f..0d60cebea1 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.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
-- 
2.17.1

[Buildroot] [PATCH 3/8] package/optee-client: bump to version 3.11.0

[Etienne Carriere]

Bump OP-TEE Client package version to OP-TEE release 3.11.0.
Remove local patch file since issue addressed since.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 ...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

diff --git a/package/optee-client/0001-libckteec-CMakeLists.txt-fix-static-build.patch b/package/optee-client/0001-libckteec-CMakeLists.txt-fix-static-build.patch
deleted file mode 100644
index 5307c7032c..0000000000
--- a/package/optee-client/0001-libckteec-CMakeLists.txt-fix-static-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From dedd04034fd246c5726ad875e8207c821e9471b7 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-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 <fontaine.fabrice@gmail.com>
-[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
-
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index b08ebc38c0..d8e507dba7 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.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
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index 842ba8a81a..8108fc2130 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH 4/8] package/optee-examples: bump to version 3.11.0

[Etienne Carriere]

Bump OP-TEE Exmaples package version to OP-TEE release 3.11.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 ff7a49a6cb..230d5d3ccf 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.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
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index d48707216b..b6f77c72f0 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH 5/8] package/optee-benchmark: bump to version 3.11.0

[Etienne Carriere]

Bump OP-TEE Benchmark package version to OP-TEE release 3.11.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 938f9ad8a4..12d1ddea88 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.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
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
index aef6176968..f9d7cae302 100644
--- a/package/optee-benchmark/optee-benchmark.mk
+++ b/package/optee-benchmark/optee-benchmark.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH 6/8] package/optee-test: bump to version 3.11.0

[Etienne Carriere]

Bump 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.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 ...-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

diff --git a/package/optee-test/0001-xtest-fix-generic-argument-handling.patch b/package/optee-test/0001-xtest-fix-generic-argument-handling.patch
deleted file mode 100644
index c61dc49c5c..0000000000
--- a/package/optee-test/0001-xtest-fix-generic-argument-handling.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e1af176af2bb274745e9b0d43456763f8946f107 Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-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 <etienne.carriere@linaro.org>
-Acked-by: Jerome Forissier <jerome@forissier.org>
----
- 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
-
diff --git a/package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch b/package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch
deleted file mode 100644
index d45644426e..0000000000
--- a/package/optee-test/0002-xtest-regression-1027-1028-skip-tests-when-test-leve.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 899099be7f522d59baa51d26077c0f5804161cfe Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Fri, 29 May 2020 15:27:06 +0200
-Subject: [PATCH] xtest: regression 1027/1028: skip tests when test level is 0
-
-Skip regression tests 1027 and 1028 when xtest runs with test level 0
-since these tests expect changes in Linux kernel that are not available
-in mainline kernel source trees, at least up to v5.7.
-
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- host/xtest/regression_1000.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c
-index a70a722..2b0140c 100644
---- a/host/xtest/regression_1000.c
-+++ b/host/xtest/regression_1000.c
-@@ -2096,6 +2096,12 @@ static void xtest_tee_test_1027(ADBG_Case_t *c)
- 	TEEC_UUID uuid_ns = { };
- 	char uuid_name[TEE_UUID_NS_NAME_SIZE] = { };
- 
-+	/* Skip test at level 0 since its dependency on patched Linux kernel */
-+	if (level == 0) {
-+		Do_ADBG_Log("Test level 0: skip regression 1027");
-+		return;
-+	}
-+
- 	result = xtest_uuid_from_str(&uuid_ns, client_uuid_linux_ns);
- 
- 	if (!ADBG_EXPECT_TEEC_SUCCESS(c, result))
-@@ -2159,6 +2165,12 @@ static void xtest_tee_test_1028(ADBG_Case_t *c)
- 	char uuid_name[TEE_UUID_NS_NAME_SIZE] = { };
- 	uint32_t group = 0;
- 
-+	/* Skip test at level 0 since its dependency on patched Linux kernel */
-+	if (level == 0) {
-+		Do_ADBG_Log("Test level 0: skip regression 1027");
-+		return;
-+	}
-+
- 	group = getegid();
- 
- 	result = xtest_uuid_from_str(&uuid_ns, client_uuid_linux_ns);
--- 
-2.17.1
-
diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
index a40f1e9069..d1085b43d9 100644
--- a/package/optee-test/Config.in
+++ b/package/optee-test/Config.in
@@ -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
diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
index 3a769ac4c2..52e2373bf7 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.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
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index fb6c9fcc50..1f4f586672 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH 7/8] package/optee-test: add deps on openssl when enabled

[Etienne Carriere]

Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to
enable some for OP-TEE embedded tests.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 package/optee-test/optee-test.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index 1f4f586672..189956651b 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -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

[Buildroot] [PATCH 8/8] configs/qemu_arm_vexpress_tz_defconfig: embed openssl library

[Etienne Carriere]

Embed openssl library to enable some OP-TEE tests that relies on it.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 configs/qemu_arm_vexpress_tz_defconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig
index 66ce636ce0..c7de60a720 100644
--- a/configs/qemu_arm_vexpress_tz_defconfig
+++ b/configs/qemu_arm_vexpress_tz_defconfig
@@ -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
-- 
2.17.1

[Buildroot] [PATCH 7/8] package/optee-test: add deps on openssl when enabled

[Thomas Petazzoni]

Hello ?tienne,

On Fri, 30 Oct 2020 08:50:44 +0100
Etienne Carriere <etienne.carriere@linaro.org> wrote:

>  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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/8] configs/qemu_arm_vexpress_tz_defconfig: enable CXX toolchain

[Thomas Petazzoni]

On Fri, 30 Oct 2020 08:50:38 +0100
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> 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 <etienne.carriere@linaro.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 6/8] package/optee-test: bump to version 3.11.0

[Thomas Petazzoni]

On Fri, 30 Oct 2020 08:50:43 +0100
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> -	depends on !BR2_TOOLCHAIN_HAS_THREADS
> +	depends on !BR2_TOOLCHAIN_HAS_THREAD

You introduced a typo here by dropping the S.

> +	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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 6/8] package/optee-test: bump to version 3.11.0

[Etienne Carriere]

On Sat, 31 Oct 2020 at 23:00, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Fri, 30 Oct 2020 08:50:43 +0100
> Etienne Carriere <etienne.carriere@linaro.org> wrote:
>
> > -     depends on !BR2_TOOLCHAIN_HAS_THREADS
> > +     depends on !BR2_TOOLCHAIN_HAS_THREAD
>
> You introduced a typo here by dropping the S.
>
> > +     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!

Understood.
Thanks for the fixes and for applying the changes.

Regards,
Etienne

>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

[Buildroot] [PATCH 7/8] package/optee-test: add deps on openssl when enabled

[Etienne Carriere]

Hello Thomas,

On Sat, 31 Oct 2020 at 22:46, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello ?tienne,
>
> On Fri, 30 Oct 2020 08:50:44 +0100
> Etienne Carriere <etienne.carriere@linaro.org> wrote:
>
> >  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 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




>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

[Buildroot] [PATCH 7/8] package/optee-test: add deps on openssl when enabled

[Yann E. MORIN]

?tienne, All,

On 2020-10-30 08:50 +0100, Etienne Carriere spake thusly:
> Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to
> enable some for OP-TEE embedded tests.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

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.

> ---
>  package/optee-test/optee-test.mk | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
> index 1f4f586672..189956651b 100644
> --- a/package/optee-test/optee-test.mk
> +++ b/package/optee-test/optee-test.mk
> @@ -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
> 
> _______________________________________________
> 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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 7/8] package/optee-test: add deps on openssl when enabled

[Etienne Carriere]

Hi,

J?r?me in copy, from the optee_test.git maintainers.

On Sun, 7 Mar 2021 at 00:15, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> ?tienne, All,
>
> On 2020-10-30 08:50 +0100, Etienne Carriere spake thusly:
> > Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to
> > enable some for OP-TEE embedded tests.
> >
> > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
>
> 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?

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

>
> Regards,
> Yann E. MORIN.
>
> > ---
> >  package/optee-test/optee-test.mk | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
> > index 1f4f586672..189956651b 100644
> > --- a/package/optee-test/optee-test.mk
> > +++ b/package/optee-test/optee-test.mk
> > @@ -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
> >
> > _______________________________________________
> > 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.  |
> '------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 7/8] package/optee-test: add deps on openssl when enabled

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > ?tienne, All,
 > On 2020-10-30 08:50 +0100, Etienne Carriere spake thusly:
 >> Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to
 >> enable some for OP-TEE embedded tests.
 >> 
 >> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

 > 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.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 8/8] configs/qemu_arm_vexpress_tz_defconfig: embed openssl library

[Thomas Petazzoni]

On Fri, 30 Oct 2020 08:50:45 +0100
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Embed openssl library to enable some OP-TEE tests that relies on it.
> 
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
>  configs/qemu_arm_vexpress_tz_defconfig | 4 ++++
>  1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com