| Message ID | 20231107152716.29305-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,kirkstone] optee: Rework include files | expand |
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-overrides.inc similarity index 51% rename from meta-ti-bsp/recipes-security/optee/optee-client-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-client-ti-overrides.inc index f64a90c3..90fc70aa 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-overrides.inc @@ -1,6 +1,3 @@ -PV = "4.0.0+git${SRCPV}" -SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" - inherit pkgconfig DEPENDS += "util-linux" diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc new file mode 100644 index 00000000..0da37acf --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc @@ -0,0 +1,2 @@ +PV = "4.0.0+git${SRCPV}" +SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend index 08c5256b..0cee127f 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend index 08c5256b..f193e78b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend index 08c5256b..17856dc3 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "optee-os-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc similarity index 96% rename from meta-ti-bsp/recipes-security/optee/optee-os-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc index 91b66a36..b1846cad 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc @@ -1,6 +1,3 @@ -PV = "4.0.0+git${SRCPV}" -SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" - # Use TI SECDEV for signing inherit ti-secdev diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc similarity index 98% rename from meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc index c1354539..2e4e53b7 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc @@ -1,3 +1,2 @@ PV = "4.0.0+git${SRCPV}" SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" - diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend index 08c5256b..0cee127f 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc similarity index 53% rename from meta-ti-bsp/recipes-security/optee/optee-test-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc index b68caf0c..6bbb0bfa 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc @@ -1,6 +1,2 @@ -PV = "4.0.0+git${SRCPV}" -SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994" - EXTRA_OEMAKE:append = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" DEPENDS:append = " openssl" - diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc new file mode 100644 index 00000000..48231a66 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc @@ -0,0 +1,2 @@ +PV = "4.0.0+git${SRCPV}" +SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994" diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend index 08c5256b..0cee127f 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES}
Minor rework of the TI include files used to override both SRCREV and other settings in the optee recipes for TI SOC parts. The intent is to make it more clear when we are changing SRCREVs versus changing other items, and allow for sharing the SRCREV changes for optee-os-tadevkit which should track the optee-os SRCREV. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- ...ee-client-ti.inc => optee-client-ti-overrides.inc} | 3 --- .../optee/optee-client-ti-version.inc | 2 ++ .../optee/optee-client_3.16%.bbappend | 11 ++++++++--- ...-examples-ti.inc => optee-examples-ti-version.inc} | 0 .../recipes-security/optee/optee-examples_%.bbappend | 6 +++--- .../optee/optee-os-tadevkit_%.bbappend | 6 +++--- .../{optee-os-ti.inc => optee-os-ti-overrides.inc} | 3 --- ...tee-os-tadevkit-ti.inc => optee-os-ti-version.inc} | 1 - .../recipes-security/optee/optee-os_3.16%.bbappend | 11 ++++++++--- ...{optee-test-ti.inc => optee-test-ti-overrides.inc} | 4 ---- .../recipes-security/optee/optee-test-ti-version.inc | 2 ++ .../recipes-security/optee/optee-test_%.bbappend | 11 ++++++++--- 12 files changed, 34 insertions(+), 26 deletions(-) rename meta-ti-bsp/recipes-security/optee/{optee-client-ti.inc => optee-client-ti-overrides.inc} (51%) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc rename meta-ti-bsp/recipes-security/optee/{optee-examples-ti.inc => optee-examples-ti-version.inc} (100%) rename meta-ti-bsp/recipes-security/optee/{optee-os-ti.inc => optee-os-ti-overrides.inc} (96%) rename meta-ti-bsp/recipes-security/optee/{optee-os-tadevkit-ti.inc => optee-os-ti-version.inc} (98%) rename meta-ti-bsp/recipes-security/optee/{optee-test-ti.inc => optee-test-ti-overrides.inc} (53%) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc