NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2021-08-02 22:09:11 +02:00
parent b9a9ce7119
commit f7a316e0fb
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/optee-benchmark/Config.in
View File

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

6
package/optee-client/Config.in
View File

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

6
package/optee-examples/Config.in
View File

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

5
package/optee-test/Config.in
View File

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