arm/optee-test: modify to use build openssl
PATCH 1/2 arm/optee-test: modify to use build openssl
By default, optee-test is using an ancient version of openssl (1.2.0o)
in binary form, located in the optee-test build tree. musl is already
working around this. So, use those defaults for everyone.
Signed-off-by Jon Mason <[email protected]>
--- meta-arm/recipes-security/optee/optee-test_3.20.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-arm/recipes-security/optee/optee-test_3.20.0.bb +3 -3
@@ -7,6 +7,6 @@ SRC_URI += " \ " SRCREV = "5db8ab4c733d5b2f4afac3e9aef0a26634c4b444" -EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" -DEPENDS:append:libc-musl = " openssl" -CFLAGS:append:libc-musl = " -Wno-error=deprecated-declarations" +EXTRA_OEMAKE:append = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" +DEPENDS:append = " openssl" +CFLAGS:append = " -Wno-error=deprecated-declarations"
Signature · 1 line
2.30.2
PATCH 2/2 arm/optee: update to 3.22.0
Update to the latest version of OP-TEE, and move the legacy versions that are still in use by meta-arm-bsp to that directory
Signed-off-by Jon Mason <[email protected]>
---
.../optee/optee-client/tee-supplicant.service | 10 +
.../optee/optee-client/tee-supplicant.sh | 46 ++++
.../optee/optee-client_3.18.0.bb | 2 +-
.../optee/optee-client_3.20.0.bb | 2 +-
.../optee/optee-examples_3.18.0.bb | 2 +-
.../optee/optee-examples_3.20.0.bb | 2 +-
...ow-setting-sysroot-for-libgcc-lookup.patch | 0
.../0002-optee-enable-clang-support.patch | 0
...3-core-link-add-no-warn-rwx-segments.patch | 0
...-Define-section-attributes-for-clang.patch | 0
...0005-core-ldelf-link-add-z-execstack.patch | 0
...ibutee-ta-add-.note.GNU-stack-sectio.patch | 0
...ow-setting-sysroot-for-libgcc-lookup.patch | 0
.../0002-optee-enable-clang-support.patch | 0
...3-core-link-add-no-warn-rwx-segments.patch | 0
...-Define-section-attributes-for-clang.patch | 0
...-core-arm-S-EL1-SPMC-boot-ABI-update.patch | 0
...-core-ffa-add-TOS_FW_CONFIG-handling.patch | 0
...re-spmc-handle-non-secure-interrupts.patch | 0
...ure-SP-s-NS-interrupt-action-based-o.patch | 0
.../optee/optee-os-tadevkit_3.18.0.bb | 0
.../optee/optee-os-tadevkit_3.20.0.bb | 0
.../optee/optee-os-ts-3.18.inc | 0
.../recipes-security/optee/optee-os_3.18.0.bb | 2 +-
.../recipes-security/optee/optee-os_3.20.0.bb | 2 +-
...pdate-arm_ffa_user-driver-dependency.patch | 39 +++
..._ffa_user-driver-compatibility-check.patch | 163 ++++++++++++
.../optee/optee-test/musl-workaround.patch | 24 ++
.../optee/optee-test/run-ptest | 52 ++++
.../optee/optee-test_3.18.0.bb | 2 +-
.../optee/optee-test_3.20.0.bb | 2 +-
meta-arm/conf/machine/qemuarm-secureboot.conf | 3 -
.../optee/optee-client_3.22.0.bb | 7 +
.../optee/optee-examples_3.22.0.bb | 3 +
...ow-setting-sysroot-for-libgcc-lookup.patch | 35 +++
...-Define-section-attributes-for-clang.patch | 240 ++++++++++++++++++
.../0002-optee-enable-clang-support.patch | 30 +++
...3-core-link-add-no-warn-rwx-segments.patch | 63 +++++
.../optee/optee-os-tadevkit_3.22.0.bb | 24 ++
.../optee/optee-os_3.1%.bbappend | 5 -
.../recipes-security/optee/optee-os_3.22.0.bb | 10 +
.../optee/optee-test_3.22.0.bb | 10 +
42 files changed, 764 insertions(+), 16 deletions(-)
create mode 100644 meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.service
create mode 100644 meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.sh
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-client_3.18.0.bb (52%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-client_3.20.0.bb (73%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-examples_3.18.0.bb (51%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-examples_3.20.0.bb (51%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.18.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.18.0/0002-optee-enable-clang-support.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.18.0/0003-core-link-add-no-warn-rwx-segments.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.18.0/0004-core-Define-section-attributes-for-clang.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.18.0/0005-core-ldelf-link-add-z-execstack.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.18.0/0006-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0002-optee-enable-clang-support.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0003-core-link-add-no-warn-rwx-segments.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0004-core-Define-section-attributes-for-clang.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0007-core-spmc-handle-non-secure-interrupts.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-3.20.0/0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-tadevkit_3.18.0.bb (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-tadevkit_3.20.0.bb (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-ts-3.18.inc (100%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os_3.18.0.bb (88%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os_3.20.0.bb (91%)
create mode 100644 meta-arm-bsp/recipes-security/optee/optee-test/Update-arm_ffa_user-driver-dependency.patch
create mode 100644 meta-arm-bsp/recipes-security/optee/optee-test/ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch
create mode 100644 meta-arm-bsp/recipes-security/optee/optee-test/musl-workaround.patch
create mode 100755 meta-arm-bsp/recipes-security/optee/optee-test/run-ptest
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-test_3.18.0.bb (86%)
rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-test_3.20.0.bb (89%)
create mode 100644 meta-arm/recipes-security/optee/optee-client_3.22.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.22.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-os-3.22.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch
create mode 100644 meta-arm/recipes-security/optee/optee-os-3.22.0/0001-core-Define-section-attributes-for-clang.patch
create mode 100644 meta-arm/recipes-security/optee/optee-os-3.22.0/0002-optee-enable-clang-support.patch
create mode 100644 meta-arm/recipes-security/optee/optee-os-3.22.0/0003-core-link-add-no-warn-rwx-segments.patch
create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.22.0.bb
delete mode 100644 meta-arm/recipes-security/optee/optee-os_3.1%.bbappend
create mode 100644 meta-arm/recipes-security/optee/optee-os_3.22.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-test_3.22.0.bbmeta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.service new file +10 -0
@@ -0,0 +1,10 @@ +[Unit] +Description=TEE Supplicant + +[Service] +User=root +EnvironmentFile=-@sysconfdir@/default/tee-supplicant +ExecStart=@sbindir@/tee-supplicant $OPTARGS + +[Install] +WantedBy=basic.target
meta-arm-bsp/recipes-security/optee/optee-client/tee-supplicant.sh new file +46 -0
46 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-client_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-client_3.18.0.bb +1 -1
@@ -1,3 +1,3 @@ -require optee-client.inc +require recipes-security/optee/optee-client.inc SRCREV = "e7cba71cc6e2ecd02f412c7e9ee104f0a5dffc6f"
meta-arm-bsp/recipes-security/optee/optee-client_3.20.0.bb renamed from meta-arm/recipes-security/optee/optee-client_3.20.0.bb +1 -1
@@ -1,4 +1,4 @@ -require optee-client.inc +require recipes-security/optee/optee-client.inc SRCREV = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc"
meta-arm-bsp/recipes-security/optee/optee-examples_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-examples_3.18.0.bb +1 -1
@@ -1,3 +1,3 @@ -require optee-examples.inc +require recipes-security/optee/optee-examples.inc SRCREV = "f301ee9df2129c0db683e726c91dc2cefe4cdb65"
meta-arm-bsp/recipes-security/optee/optee-examples_3.20.0.bb renamed from meta-arm/recipes-security/optee/optee-examples_3.20.0.bb +1 -1
@@ -1,3 +1,3 @@ -require optee-examples.inc +require recipes-security/optee/optee-examples.inc SRCREV = "a98d01e1b9168eaed96bcd0bac0df67c44a81081"
meta-arm-bsp/recipes-security/optee/optee-os-3.18.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch renamed from meta-arm/recipes-security/optee/optee-os-3.18.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.18.0/0002-optee-enable-clang-support.patch renamed from meta-arm/recipes-security/optee/optee-os-3.18.0/0002-optee-enable-clang-support.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.18.0/0003-core-link-add-no-warn-rwx-segments.patch renamed from meta-arm/recipes-security/optee/optee-os-3.18.0/0003-core-link-add-no-warn-rwx-segments.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.18.0/0004-core-Define-section-attributes-for-clang.patch renamed from meta-arm/recipes-security/optee/optee-os-3.18.0/0004-core-Define-section-attributes-for-clang.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.18.0/0005-core-ldelf-link-add-z-execstack.patch renamed from meta-arm/recipes-security/optee/optee-os-3.18.0/0005-core-ldelf-link-add-z-execstack.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.18.0/0006-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch renamed from meta-arm/recipes-security/optee/optee-os-3.18.0/0006-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0002-optee-enable-clang-support.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0002-optee-enable-clang-support.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0003-core-link-add-no-warn-rwx-segments.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0003-core-link-add-no-warn-rwx-segments.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0004-core-Define-section-attributes-for-clang.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0004-core-Define-section-attributes-for-clang.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0007-core-spmc-handle-non-secure-interrupts.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0007-core-spmc-handle-non-secure-interrupts.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch renamed from meta-arm/recipes-security/optee/optee-os-3.20.0/0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.18.0.bb +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.20.0.bb +0 -0
meta-arm-bsp/recipes-security/optee/optee-os-ts-3.18.inc renamed from meta-arm/recipes-security/optee/optee-os-ts-3.18.inc +0 -0
meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.18.0.bb +1 -1
@@ -1,4 +1,4 @@ -require optee-os.inc +require recipes-security/optee/optee-os.inc DEPENDS += "dtc-native"
meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.20.0.bb +1 -1
@@ -1,4 +1,4 @@ -require optee-os.inc +require recipes-security/optee/optee-os.inc DEPENDS += "dtc-native"
meta-arm-bsp/recipes-security/optee/optee-test/Update-arm_ffa_user-driver-dependency.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 7e15470f3dd45c844f0e0901f0c85c46a0882b8b Mon Sep 17 00:00:00 2001 +From: Gabor Toth <[email protected]> +Date: Fri, 3 Mar 2023 12:23:45 +0100 +Subject: [PATCH 1/2] Update arm_ffa_user driver dependency + +Updating arm-ffa-user to v5.0.1 to get the following changes: + - move to 64 bit direct messages + - add Linux Kernel v6.1 compatibility +The motivation is to update x-test to depend on the same driver +version as TS uefi-test and thus to enable running these in a single +configuration. +Note: arm_ffa_user.h was copied from: + - URL:https://git.gitlab.arm.com/linux-arm/linux-trusted-services.git + - SHA:18e3be71f65a405dfb5d97603ae71b3c11759861 + +Upstream-Status: Backport + +Signed-off-by: Gabor Toth <[email protected]> +Acked-by: Jens Wiklander <[email protected]> +--- + host/xtest/include/uapi/linux/arm_ffa_user.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/host/xtest/include/uapi/linux/arm_ffa_user.h b/host/xtest/include/uapi/linux/arm_ffa_user.h +index 9ef0be3..0acde4f 100644 +--- a/host/xtest/include/uapi/linux/arm_ffa_user.h ++++ b/host/xtest/include/uapi/linux/arm_ffa_user.h +@@ -33,7 +33,7 @@ struct ffa_ioctl_ep_desc { + * @dst_id: [in] 16-bit ID of destination endpoint. + */ + struct ffa_ioctl_msg_args { +- __u32 args[5]; ++ __u64 args[5]; + __u16 dst_id; + }; + #define FFA_IOC_MSG_SEND _IOWR(FFA_IOC_MAGIC, FFA_IOC_BASE + 1, \ +-- +2.39.1.windows.1 +
meta-arm-bsp/recipes-security/optee/optee-test/ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch new file +163 -0
163 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-test/musl-workaround.patch new file +24 -0
@@ -0,0 +1,24 @@ +Hack to work around musl compile error: + In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23, + from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25: + optee-test/3.17.0-r0/recipe-sysroot/usr/include/bits/stat.h:17:26: error: expected identifier or '(' before '[' token + 17 | unsigned __unused[2]; + | ^ + +stat.h is not needed, since it is not being used in this file. So removing it. + +Upstream-Status: Pending [Not submitted to upstream yet] +Signed-off-by: Jon Mason <[email protected]> + +diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c +index 4264884..7f1baca 100644 +--- a/host/xtest/regression_1000.c ++++ b/host/xtest/regression_1000.c +@@ -22,7 +22,6 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <sys/stat.h> + #include <sys/types.h> + #include <ta_arm_bti.h> + #include <ta_concurrent.h>
meta-arm-bsp/recipes-security/optee/optee-test/run-ptest new file +52 -0
52 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bb renamed from meta-arm/recipes-security/optee/optee-test_3.18.0.bb +1 -1
@@ -1,4 +1,4 @@ -require optee-test.inc +require recipes-security/optee/optee-test.inc SRC_URI += " \ file://musl-workaround.patch \
meta-arm-bsp/recipes-security/optee/optee-test_3.20.0.bb renamed from meta-arm/recipes-security/optee/optee-test_3.20.0.bb +1 -1
@@ -1,4 +1,4 @@ -require optee-test.inc +require recipes-security/optee/optee-test.inc SRC_URI += " \ file://Update-arm_ffa_user-driver-dependency.patch \
meta-arm/conf/machine/qemuarm-secureboot.conf +0 -3
@@ -21,6 +21,3 @@ WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" - -PREFERRED_VERSION_optee-os ?= "3.18.%" -
meta-arm/recipes-security/optee/optee-client_3.22.0.bb new file +7 -0
@@ -0,0 +1,7 @@ +require optee-client.inc + +SRCREV = "8533e0e6329840ee96cf81b6453f257204227e6c" + +inherit pkgconfig +DEPENDS += "util-linux" +EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
meta-arm/recipes-security/optee/optee-examples_3.22.0.bb new file +3 -0
@@ -0,0 +1,3 @@ +require optee-examples.inc + +SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
meta-arm/recipes-security/optee/optee-os-3.22.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 528aeb42652a3159c1bfd51d6c1442c3ff27b84c Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Tue, 26 May 2020 14:38:02 -0500 +Subject: [PATCH] allow setting sysroot for libgcc lookup + +Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching +for the compiler libraries as there's no easy way to reliably pass --sysroot +otherwise. + +Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188] +Signed-off-by: Ross Burton <[email protected]> + +--- + mk/gcc.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mk/gcc.mk b/mk/gcc.mk +index adc77a24..81bfa78a 100644 +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ + -print-file-name=include 2> /dev/null) + + # Get location of libgcc from gcc +-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ ++libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ + -print-libgcc-file-name 2> /dev/null) +-libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ ++libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ + -print-file-name=libstdc++.a 2> /dev/null) +-libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ ++libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ + -print-file-name=libgcc_eh.a 2> /dev/null) + + # Define these to something to discover accidental use
meta-arm/recipes-security/optee/optee-os-3.22.0/0001-core-Define-section-attributes-for-clang.patch new file +240 -0
240 lines not on this page · raw message
meta-arm/recipes-security/optee/optee-os-3.22.0/0002-optee-enable-clang-support.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 8846ab2b37781364088cc5c02b6bc6f518a66a0a Mon Sep 17 00:00:00 2001 +From: Brett Warren <[email protected]> +Date: Wed, 23 Sep 2020 09:27:34 +0100 +Subject: [PATCH] optee: enable clang support + +When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used +to provide a sysroot wasn't included, which results in not locating +compiler-rt. This is mitigated by including the variable as ammended. + +Upstream-Status: Pending +ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701 +Signed-off-by: Brett Warren <[email protected]> + +--- + mk/clang.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mk/clang.mk b/mk/clang.mk +index a045beee..1ebe2f70 100644 +--- a/mk/clang.mk ++++ b/mk/clang.mk +@@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \ + + # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of + # libgcc for clang +-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ ++libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ + -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null) + + # Core ASLR relies on the executable being ready to run from its preferred load
meta-arm/recipes-security/optee/optee-os-3.22.0/0003-core-link-add-no-warn-rwx-segments.patch new file +63 -0
63 lines not on this page · raw message
meta-arm/recipes-security/optee/optee-os-tadevkit_3.22.0.bb new file +24 -0
@@ -0,0 +1,24 @@ +require optee-os_3.22.0.bb + +SUMMARY = "OP-TEE Trusted OS TA devkit" +DESCRIPTION = "OP-TEE TA devkit for build TAs" +HOMEPAGE = "https://www.op-tee.org/" + +DEPENDS += "python3-pycryptodome-native" + +do_install() { + #install TA devkit + install -d ${D}${includedir}/optee/export-user_ta/ + for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do + cp -aR $f ${D}${includedir}/optee/export-user_ta/ + done +} + +do_deploy() { + echo "Do not inherit do_deploy from optee-os." +} + +FILES:${PN} = "${includedir}/optee/" + +# Build paths are currently embedded +INSANE_SKIP:${PN}-dev += "buildpaths"
meta-arm/recipes-security/optee/optee-os_3.1%.bbappend deleted +0 -5
@@ -1,5 +0,0 @@ -# Include Trusted Services Secure Partitions -require optee-os-ts-3.18.inc - -# Conditionally include platform specific Trusted Services related OPTEE build parameters -EXTRA_OEMAKE:append:qemuarm64-secureboot = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_CORE_HEAP_SIZE=131072 CFG_TEE_BENCHMARK=n CFG_TEE_CORE_LOG_LEVEL=4 CFG_CORE_SEL1_SPMC=y ', d)}"
meta-arm/recipes-security/optee/optee-os_3.22.0.bb new file +10 -0
@@ -0,0 +1,10 @@ +require optee-os.inc + +DEPENDS += "dtc-native" + +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-3.22.0:" + +SRCREV = "001ace6655dd6bb9cbe31aa31b4ba69746e1a1d9" +SRC_URI += " \ + file://0001-core-Define-section-attributes-for-clang.patch \ + "
meta-arm/recipes-security/optee/optee-test_3.22.0.bb new file +10 -0
@@ -0,0 +1,10 @@ +require optee-test.inc + +SRC_URI += " \ + file://musl-workaround.patch \ + " +SRCREV = "a286b57f1721af215ace318d5807e63f40186df6" + +EXTRA_OEMAKE:append = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" +DEPENDS:append = " openssl" +CFLAGS:append = " -Wno-error=deprecated-declarations"
Signature · 1 line
2.30.2