On 4/29/19 4:15 PM, Denys Dmytriyenko wrote:
> On Mon, Apr 29, 2019 at 04:13:21PM -0400, Andrew F. Davis wrote:
>> On 4/29/19 2:13 PM, Denys Dmytriyenko wrote:
>>> On Tue, Apr 23, 2019 at 02:52:20PM -0400, Andrew F. Davis wrote:
>>>> On 4/23/19 2:40 PM, Dan Murphy wrote:
>>>>> +Andrew
>>>>>
>>>>> On 4/23/19 1:38 PM, Dan Murphy wrote:
>>>>>> Signed-off-by: Dan Murphy <[email protected]>
>>>>>> ---
>>>>>>  .../recipes-security/optee/optee-os_git.bbappend              | 4 ++--
>>>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git 
>>>>>> a/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend 
>>>>>> b/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend
>>>>>> index 2204a50c..ee87b3c7 100644
>>>>>> --- a/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend
>>>>>> +++ b/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend
>>>>>> @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>>>>>  
>>>>>>  PR_append = ".arago0"
>>>>>>  
>>>>>> -PV = "3.2.0+git${SRCPV}"
>>>>>> +PV = "3.5.0+git${SRCPV}"
>>>
>>>> Might want to do the same for client/test, but they got tagged at 3.4.0,
>>>> I've moved the HEAD forward to 3.5.0, we can wait till then next rc tag
>>>> to move them here, it should not be a problem.
>>>
>>> Andrew,
>>>
>>> It seems there were few more commits that went into the official 3.5.0 
>>> release, which was released 3 days ago. Do you want to re-merge to include 
>>> those?
>>>
>>
>> Merged the extra patches as ti-optee-os (note the '-', not '_'), I want
>> to deprecate out the branch name with underscores if I can, none of the
>> other projects are named like that, so I'd like to start using this
>> branch. Not sure what churn that will cause but hopefully will be easy
>> enough to do now.
> 
> Thanks. client and test are still using underscores - plan to change those?
> 

Done, and test was reset to follow upstream master directly, before we
had the same content but some stray merges got in at some point, the
name change seems like a good opportunity to fix that.

Andrew

> 
>>>>>>  is_armv7 = "1"
>>>>>>  is_armv7_aarch64 = "0"
>>>>>> @@ -11,7 +11,7 @@ SRC_URI = 
>>>>>> "git://git.ti.com/optee/ti-optee-os.git;branch=${BRANCH} \
>>>>>>             file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
>>>>>>  "
>>>>>>  BRANCH = "ti_optee_os"
>>>>>> -SRCREV = "48952f9f76d885df4cb65f8479a4cf7dedf0ee54"
>>>>>> +SRCREV = "b38f935200f67f9408d7c5d99fe703e5cc806c65"
>>>>>>  
>>>>>>  ARMCORE = "CFG_ARM32_core=y ta-targets=ta_arm32"
>>>>>>  ARMCORE_aarch64 = "CFG_ARM64_core=y ta-targets=ta_arm64"
>>>>>>
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to