From 8f0061b666d8429bc8993256f5a1d6c0a01689f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 26 Jul 2023 22:02:44 +0200 Subject: [PATCH] package/optee-client: needs MMU Upstream added fork() with commit https://github.com/OP-TEE/optee_client/commit/492410dcb78f07677524e1d932c86260180ea72c in version 3.19.0 which was added to buildroot with commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82. Fixes: - version 3.21.0: http://autobuild.buildroot.net/results/f81/f819828f11330d928df1a236bc8f83193a8a6315/ - version 3.19.0: http://autobuild.buildroot.net/results/e7b/e7b5c6f16083435a2e76bce00de718cf9d8c6a5b/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/optee-client/Config.in | 2 ++ package/optee-examples/Config.in | 2 ++ package/optee-test/Config.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index 538948b72c..4061164cbb 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_CLIENT bool "optee-client" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # MMC_IOC_MULTI_CMD + depends on BR2_USE_MMU # fork() help Enable the OP-TEE client package that brings non-secure client application resources for OP-TEE support. OP-TEE @@ -48,5 +49,6 @@ config BR2_PACKAGE_OPTEE_CLIENT_TEEACL endif comment "optee-client needs a toolchain w/ threads, headers >= 4.3" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index 843981a458..eb6ee16502 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client + depends on BR2_USE_MMU # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -22,5 +23,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES comment "optee-examples needs a toolchain w/ threads, dynamic library, headers >= 4.3" depends on BR2_TARGET_OPTEE_OS + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index cf36d19fab..57a7834c75 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OPTEE_TEST depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client + depends on BR2_USE_MMU # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -27,5 +28,6 @@ config BR2_PACKAGE_OPTEE_TEST comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers >= 4.3" depends on BR2_TARGET_OPTEE_OS + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3