| Message ID | 20220513141231.2513449-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build | expand |
On Fri, 13 May 2022 15:12:27 +0100, Ross Burton wrote: > The corstone1000 build of optee-os has a bbappend which uses a specific > non-upstream branch of optee-os which is actually based on 3.10, so set > PV appropriately in the recipe and update the PREFERRED_VERSION in > corstone1000.inc. Applied, thanks! [1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build commit: 4b94d77f693a0d21d01eb287d5a9757ecb5122b0 [2/5] arm-bsp/optee-test: clean up bbappends commit: 6286e0d54cdc6edf9e1d03019fd9e0440f0d546f [3/5] arm-bsp/optee-os: remove 3.16 bbappend commit: 7e09d10e23f4bd92ab0d559e8c84b32ee949fa22 [4/5] arm-bsp/optee-client: remove bbappends commit: 155a2f9ed4ff26d95ca0228d8d069062ac5bb4e4 [5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend commit: 79a20dc1d76fbd983365c29063eca64872b8ab1d Best regards,
On Fri, 13 May 2022 15:12:27 +0100, Ross Burton wrote: > The corstone1000 build of optee-os has a bbappend which uses a specific > non-upstream branch of optee-os which is actually based on 3.10, so set > PV appropriately in the recipe and update the PREFERRED_VERSION in > corstone1000.inc. Applied, thanks! [1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build commit: 4b94d77f693a0d21d01eb287d5a9757ecb5122b0 [2/5] arm-bsp/optee-test: clean up bbappends commit: 6286e0d54cdc6edf9e1d03019fd9e0440f0d546f [3/5] arm-bsp/optee-os: remove 3.16 bbappend commit: 7e09d10e23f4bd92ab0d559e8c84b32ee949fa22 [4/5] arm-bsp/optee-client: remove bbappends commit: 155a2f9ed4ff26d95ca0228d8d069062ac5bb4e4 [5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend commit: 79a20dc1d76fbd983365c29063eca64872b8ab1d Best regards,
On Fri, 13 May 2022 15:12:27 +0100, Ross Burton wrote: > The corstone1000 build of optee-os has a bbappend which uses a specific > non-upstream branch of optee-os which is actually based on 3.10, so set > PV appropriately in the recipe and update the PREFERRED_VERSION in > corstone1000.inc. Applied, thanks! [1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build commit: 4b94d77f693a0d21d01eb287d5a9757ecb5122b0 [2/5] arm-bsp/optee-test: clean up bbappends commit: 6286e0d54cdc6edf9e1d03019fd9e0440f0d546f [3/5] arm-bsp/optee-os: remove 3.16 bbappend commit: 7e09d10e23f4bd92ab0d559e8c84b32ee949fa22 [4/5] arm-bsp/optee-client: remove bbappends commit: 155a2f9ed4ff26d95ca0228d8d069062ac5bb4e4 [5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend commit: 79a20dc1d76fbd983365c29063eca64872b8ab1d Best regards,
diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 380ed30f..2f665d02 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -34,8 +34,8 @@ UBOOT_ARCH = "arm" UBOOT_EXTLINUX = "0" # optee -PREFERRED_VERSION_optee-os ?= "3.14%" -PREFERRED_VERSION_optee-client ?= "3.14%" +PREFERRED_VERSION_optee-os ?= "3.10.%" +PREFERRED_VERSION_optee-client ?= "3.14.%" EXTRA_IMAGEDEPENDS += "optee-os" OPTEE_ARCH = "arm64" OPTEE_BINARY = "tee-pager_v2.bin" diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc index e17467fe..9f372413 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc @@ -1,6 +1,6 @@ SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development" SRCREV = "f9de2c9520ed97b89760cc4c99424aae440b63f4" -PV .= "+git${SRCPV}" +PV = "3.10.0+git${SRCPV}" DEPENDS += "python3-pycryptodomex-native dtc-native"
The corstone1000 build of optee-os has a bbappend which uses a specific non-upstream branch of optee-os which is actually based on 3.10, so set PV appropriately in the recipe and update the PREFERRED_VERSION in corstone1000.inc. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 4 ++-- .../recipes-security/optee/optee-os_corstone1000_common.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)