[PATCH 1/2] optee-spdevkit: Apply the sysroot patches

[PATCH 1/2] optee-spdevkit: Apply the sysroot patches

[Khem Raj]

These patches are needed for getting right C runtime library

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-arm/recipes-security/optee/optee-spdevkit_git.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-arm/recipes-security/optee/optee-spdevkit_git.bb b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
index ec1b205..931eb64 100644
--- a/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
+++ b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 
 inherit deploy python3native
 require optee.inc
+FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
 
 CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 
@@ -15,7 +16,10 @@ DEPENDS = "python3-pyelftools-native"
 DEPENDS:append:toolchain-clang = " compiler-rt"
 
 # spdevkit isn't yet merged to master
-SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development"
+SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development \
+    file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
+    file://0007-allow-setting-sysroot-for-clang.patch \
+"
 SRCREV = "f9de2c9520ed97b89760cc4c99424aae440b63f4"
 PV = "3.10+git${SRCPV}"
 
-- 
2.36.1

[PATCH 2/2] optee-spdevkit: Disable for 32bit arm

[Khem Raj]

FFA secure partitions aren't supported on 32-bit Arm currently

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-arm/recipes-security/optee/optee-spdevkit_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-arm/recipes-security/optee/optee-spdevkit_git.bb b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
index 931eb64..def2d8d 100644
--- a/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
+++ b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
@@ -297,5 +297,7 @@ EOF
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+COMPATIBLE_HOST = "aarch64.*-linux"
+
 # optee-spdevkit static library is part of optee-os image. No need to package this library in a staticdev package
 INSANE_SKIP:${PN}-dev = "staticdev"
-- 
2.36.1

Re: [PATCH 1/2] optee-spdevkit: Apply the sysroot patches

[Jon Mason]

On Fri, 13 May 2022 08:42:57 -0700, Khem Raj wrote:
> These patches are needed for getting right C runtime library

Applied, thanks!

[1/2] optee-spdevkit: Apply the sysroot patches
      commit: 62db19b37170d6f66d3cd4c2a85e33cfb92f6d46
[2/2] optee-spdevkit: Disable for 32bit arm
      commit: 9c07b0c0d0cdccc44d755e1c395eed55f0bb70de

Best regards,
-- 
Jon Mason <jon.mason@arm.com>