diff options
| author | Ryan Eatmon <reatmon@ti.com> | 2023-10-25 16:46:27 -0500 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2023-10-27 10:14:46 -0500 |
| commit | 8a528676191468b0d5ca56ca791ce73267223702 (patch) | |
| tree | ef3d824019e5a2de72f53ccedd1e1517e996474a | |
| parent | bae3658ac0bc1c9adac7a882439cabb385cae720 (diff) | |
| download | meta-ti-8a528676191468b0d5ca56ca791ce73267223702.tar.gz | |
optee: Update to upstream 4.0.0
Update all of the optee components to the upstream 4.0.0 version.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
5 files changed, 15 insertions, 10 deletions
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc index fef87d30..f64a90c3 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | PV = "3.20.0+git${SRCPV}" | 1 | PV = "4.0.0+git${SRCPV}" |
| 2 | SRCREV = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc" | 2 | SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" |
| 3 | 3 | ||
| 4 | inherit pkgconfig | 4 | inherit pkgconfig |
| 5 | DEPENDS += "util-linux" | 5 | DEPENDS += "util-linux" |
diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc index 7d119f0d..7a733f53 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | PV = "3.20.0+git${SRCPV}" | 1 | PV = "4.0.0+git${SRCPV}" |
| 2 | SRCREV = "a98d01e1b9168eaed96bcd0bac0df67c44a81081" | 2 | SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035" |
| 3 | SRC_URI:remove = "file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" | 3 | SRC_URI:remove = "file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" |
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc index 18820af1..c1354539 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | PV = "3.20.0+git${SRCPV}" | 1 | PV = "4.0.0+git${SRCPV}" |
| 2 | SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" | 2 | SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" |
| 3 | |||
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc index 21b28474..91b66a36 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | PV = "3.20.0+git${SRCPV}" | 1 | PV = "4.0.0+git${SRCPV}" |
| 2 | SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" | 2 | SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" |
| 3 | 3 | ||
| 4 | # Use TI SECDEV for signing | 4 | # Use TI SECDEV for signing |
| 5 | inherit ti-secdev | 5 | inherit ti-secdev |
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc index 43e0172d..b68caf0c 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc | |||
| @@ -1,2 +1,6 @@ | |||
| 1 | PV = "3.19.0+git${SRCPV}" | 1 | PV = "4.0.0+git${SRCPV}" |
| 2 | SRCREV = "ab9863cc187724e54c032b738c28bd6e9460a4db" | 2 | SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994" |
| 3 | |||
| 4 | EXTRA_OEMAKE:append = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" | ||
| 5 | DEPENDS:append = " openssl" | ||
| 6 | |||