From 5536ce026de6cd30979eb906f729745e77ba66fb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 29 Nov 2021 14:25:01 +0000 Subject: [PATCH] arm/optee-spdevkit: fix non-corstone1000 builds This recipe was setting a default SRCREV which doesn't contain the Secure Partition devkit, as this is only in the psa-development branch on the trustedfirmware.org mirror which is set by the corstone1000 bbappend. Use this branch/revision by default, and set the PV correctly: this branch is currently based on optee-os 3.10 not 3.14. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-security/optee/optee-spdevkit_git.bb | 5 ++++- 1 file changed, 4 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 a9c696d3..f23cfa7a 100644 --- a/meta-arm/recipes-security/optee/optee-spdevkit_git.bb +++ b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb @@ -14,7 +14,10 @@ DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyel DEPENDS:append:toolchain-clang = " compiler-rt" -SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" +# spdevkit isn't yet merged to master +SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development" +SRCREV = "f9de2c9520ed97b89760cc4c99424aae440b63f4" +PV = "3.10+git${SRCPV}" S = "${WORKDIR}/git" B = "${WORKDIR}/build"