package/optee-client: add dependency on headers >= 4.3

Since upstream commit 5da4da99e0bb3d694e93046207ae4ce3b5545043, in
3.13.0, OP-TEE client unconditionally uses the MMC_IOC_MULTI_CMD
ioctl(). But this ioctl() was only introduced in kernel 4.3, so
earlier kernels did not have this definition.

This was clearly known when upstream started using this ioctl. From
the upstream commit 5da4da99e0bb3d694e93046207ae4ce3b5545043 commit
log:

    As MMC_IOC_MULTI_CMD is available since linux 4.3, we should be safe to
    use it by default on read / write block operations.

So let's propagate this dependency into Buildroot.

Fixes:

  http://autobuild.buildroot.net/results/bd270a6793df499d5f52959e3de17f8a92d88305/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in
index 0257392d3a890c98b5d11c7774171a1573ea9898..2070582fbbbd0f6679bf22cbea7c4b077025f214 100644 (file)
--- a/package/optee-benchmark/Config.in
+++ b/package/optee-benchmark/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
        depends on BR2_USE_MMU # fork()
        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
        select BR2_PACKAGE_OPTEE_CLIENT
        select BR2_PACKAGE_LIBYAML
        help
@@ -13,6 +14,7 @@ config BR2_PACKAGE_OPTEE_BENCHMARK
 
          http://github.com/linaro-swg/optee_benchmark
 
-comment "optee-benchmark needs a toolchain w/ threads, dynamic library"
+comment "optee-benchmark needs a toolchain w/ threads, dynamic library, headers >= 4.3"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
+               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3

diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
index d2fda18df80f9ccd77c26503f5912cbef3d8609d..2765f493086a2fad15e76cf9cac833428e5f8621 100644 (file)
--- 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_STATIC_LIBS # dlfcn.h
+       depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # MMC_IOC_MULTI_CMD
        help
          Enable the OP-TEE client package that brings non-secure
          client application resources for OP-TEE support. OP-TEE
@@ -26,5 +27,6 @@ config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
 
 endif
 
-comment "optee-client needs a toolchain w/ threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+comment "optee-client needs a toolchain w/ threads, dynamic library, headers >= 4.3"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
+               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3

diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
index 859cd6632e90e99dd8b95d005c66e6b9b0395e50..843981a4587573ca5596f66b684301432b5f0a49 100644 (file)
--- a/package/optee-examples/Config.in
+++ b/package/optee-examples/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES
        depends on BR2_TARGET_OPTEE_OS
        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
        select BR2_PACKAGE_OPTEE_CLIENT
        select BR2_TARGET_OPTEE_OS_SDK
        help
@@ -19,6 +20,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES
 
          https://github.com/linaro-swg/optee_examples
 
-comment "optee-examples needs a toolchain w/ threads, dynamic library"
+comment "optee-examples needs a toolchain w/ threads, dynamic library, headers >= 4.3"
        depends on BR2_TARGET_OPTEE_OS
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       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 cfcf74939d92f45895a1916872a62647ec289934..cf36d19fab0faafbd61efe3d73dd4b34d36b243e 100644 (file)
--- a/package/optee-test/Config.in
+++ b/package/optee-test/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_OPTEE_TEST
        depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client
        depends on BR2_INSTALL_LIBSTDCPP
        depends on !BR2_STATIC_LIBS # optee-client
+       depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 # optee-client
        select BR2_PACKAGE_OPTEE_CLIENT
        select BR2_TARGET_OPTEE_OS_SDK
        help
@@ -24,7 +25,7 @@ config BR2_PACKAGE_OPTEE_TEST
 
          http://github.com/OP-TEE/optee_test
 
-comment "optee-test needs a toolchain w/ threads, C++, dynamic library"
+comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers >= 4.3"
        depends on BR2_TARGET_OPTEE_OS
        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
-               BR2_STATIC_LIBS
+               BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3