From: Ryan Eatmon <reatmon@ti.com>
To: Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
<meta-ti@lists.yoctoproject.org>
Subject: Re: [meta-ti][master][RFC v2] optee: Rework include files
Date: Tue, 7 Nov 2023 09:09:00 -0600 [thread overview]
Message-ID: <6a53fe9a-c453-4855-809c-8d3e39616c0e@ti.com> (raw)
In-Reply-To: <17943C9A5D16C3D6.3650@lists.yoctoproject.org>
Given that this patch has not generated any additional converstaion,
I'll send out an offical patch for master and kirkstone with these changes.
On 11/3/2023 5:13 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
>
> Forgot that v2 is just renaming the verison file based on prior feedback.
>
>
> On 11/3/2023 5:07 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
>> 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>
>> ---
>> ...ptee-client-ti.inc => optee-client-ti-version.inc} | 0
>> .../recipes-security/optee/optee-client_%.bbappend | 6 +++---
>> ...-examples-ti.inc => optee-examples-ti-version.inc} | 0
>> .../recipes-security/optee/optee-examples_%.bbappend | 6 +++---
>> .../optee/optee-os-tadevkit-ti-overrides.inc | 1 +
>> .../optee/optee-os-tadevkit_%.bbappend | 11 ++++++++---
>> .../{optee-os-ti.inc => optee-os-ti-overrides.inc} | 8 --------
>> ...tee-os-tadevkit-ti.inc => optee-os-ti-version.inc} | 2 --
>> .../recipes-security/optee/optee-os_%.bbappend | 11 ++++++++---
>> .../{optee-test-ti.inc => optee-test-ti-version.inc} | 0
>> .../recipes-security/optee/optee-test_%.bbappend | 6 +++---
>> 11 files changed, 26 insertions(+), 25 deletions(-)
>> rename meta-ti-bsp/recipes-security/optee/{optee-client-ti.inc =>
>> optee-client-ti-version.inc} (100%)
>> rename meta-ti-bsp/recipes-security/optee/{optee-examples-ti.inc =>
>> optee-examples-ti-version.inc} (100%)
>> create mode 100644
>> meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc
>> rename meta-ti-bsp/recipes-security/optee/{optee-os-ti.inc =>
>> optee-os-ti-overrides.inc} (86%)
>> rename meta-ti-bsp/recipes-security/optee/{optee-os-tadevkit-ti.inc
>> => optee-os-ti-version.inc} (87%)
>> rename meta-ti-bsp/recipes-security/optee/{optee-test-ti.inc =>
>> optee-test-ti-version.inc} (100%)
>>
>> diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc
>> b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
>> similarity index 100%
>> rename from meta-ti-bsp/recipes-security/optee/optee-client-ti.inc
>> rename to meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
>> diff --git
>> a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
>> b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
>> index 08c5256b..f193e78b 100644
>> --- a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
>> +++ b/meta-ti-bsp/recipes-security/optee/optee-client_%.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-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-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc
>> new file mode 100644
>> index 00000000..df46e243
>> --- /dev/null
>> +++
>> b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc
>> @@ -0,0 +1 @@
>> +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"
>> 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..980f7a4b 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,9 @@
>> -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}
>> +
>> +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-os-ti.inc
>> b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
>> similarity index 86%
>> 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 6d192bbe..de13d282 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,11 +1,3 @@
>> -PV = "4.0.0+git${SRCPV}"
>> -SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
>> -
>> -# Fixes for pointing to 4.0.0 before upstream meta-arm
>> -FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:"
>> -SRC_URI:remove =
>> "file://0002-core-Define-section-attributes-for-clang.patch"
>> -SRC_URI:append = "
>> file://0002ti-core-Define-section-attributes-for-clang.patch"
>> -
>> # 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 87%
>> 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 55453366..06472e34 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
>> @@ -5,5 +5,3 @@ SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
>> FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:"
>> SRC_URI:remove =
>> "file://0002-core-Define-section-attributes-for-clang.patch"
>> SRC_URI:append = "
>> file://0002ti-core-Define-section-attributes-for-clang.patch"
>> -
>> -EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"
>> diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
>> b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
>> index 08c5256b..0cee127f 100644
>> --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
>> +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.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-version.inc
>> similarity index 100%
>> rename from meta-ti-bsp/recipes-security/optee/optee-test-ti.inc
>> rename to meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
>> diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
>> b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
>> index 08c5256b..f193e78b 100644
>> --- a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
>> +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.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}
>>
>>
>>
>>
>>
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17241): https://lists.yoctoproject.org/g/meta-ti/message/17241
> Mute This Topic: https://lists.yoctoproject.org/mt/102374573/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
next prev parent reply other threads:[~2023-11-07 15:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <17943C4ECC579846.30622@lists.yoctoproject.org>
2023-11-03 22:13 ` [meta-ti][master][RFC v2] optee: Rework include files Ryan Eatmon
[not found] ` <17943C9A5D16C3D6.3650@lists.yoctoproject.org>
2023-11-07 15:09 ` Ryan Eatmon [this message]
2023-11-03 22:07 Ryan Eatmon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6a53fe9a-c453-4855-809c-8d3e39616c0e@ti.com \
--to=reatmon@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=praneeth@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).