| Message ID | 20221202100452.1868797-1-m-chawdhry@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,dunfell] optee: update optee-client, optee-test, optee-examples to 3.19 tag | expand |
On 12/2/2022 4:04, Manorit Chawdhry wrote: > optee-os was updated to 3.19 tag but the others were still outdated. > > Updates other optee components to 3.19 tag > > Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> > --- > recipes-security/optee/optee-client_%.bbappend | 4 ++-- > recipes-security/optee/optee-examples_%.bbappend | 4 ++-- > recipes-security/optee/optee-test_%.bbappend | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend > index 5675570a..6737ba92 100644 > --- a/recipes-security/optee/optee-client_%.bbappend > +++ b/recipes-security/optee/optee-client_%.bbappend > @@ -1,2 +1,2 @@ > -PV_ti-soc = "3.17.0+git${SRCPV}" > -SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" > +PV_ti-soc = "3.19.0+git${SRCPV}" > +SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" optee-client will not build against this SRCREV. They added a call to pkg-config which is not readily available to the recipe without a change to your patch. You need to add: DEPENDS += "pkgconfig" Please do so and resubmit the patch. > diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend > index 9941b345..dda7cbbf 100644 > --- a/recipes-security/optee/optee-examples_%.bbappend > +++ b/recipes-security/optee/optee-examples_%.bbappend > @@ -1,5 +1,5 @@ > -PV_ti-soc = "3.17.0+git${SRCPV}" > -SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" > +PV_ti-soc = "3.19.0+git${SRCPV}" > +SRCREV_ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65" > SRC_URI_ti-soc = "git://github.com/linaro-swg/optee_examples.git;protocol=https" > > DEPENDS_append_ti-soc = " python3-cryptography-native" > diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend > index d81ae521..79b4b4d6 100644 > --- a/recipes-security/optee/optee-test_%.bbappend > +++ b/recipes-security/optee/optee-test_%.bbappend > @@ -1,5 +1,5 @@ > -PV_ti-soc = "3.17.0+git${SRCPV}" > -SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" > +PV_ti-soc = "3.19.0+git${SRCPV}" > +SRCREV_ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db" > SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" > > DEPENDS_append_ti-soc = " python3-cryptography-native"
On Fri, Dec 02, 2022 at 08:04:52PM -0600, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 12/2/2022 4:04, Manorit Chawdhry wrote: > >optee-os was updated to 3.19 tag but the others were still outdated. > > > >Updates other optee components to 3.19 tag > > > >Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> > >--- > > recipes-security/optee/optee-client_%.bbappend | 4 ++-- > > recipes-security/optee/optee-examples_%.bbappend | 4 ++-- > > recipes-security/optee/optee-test_%.bbappend | 4 ++-- > > 3 files changed, 6 insertions(+), 6 deletions(-) > > > >diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend > >index 5675570a..6737ba92 100644 > >--- a/recipes-security/optee/optee-client_%.bbappend > >+++ b/recipes-security/optee/optee-client_%.bbappend > >@@ -1,2 +1,2 @@ > >-PV_ti-soc = "3.17.0+git${SRCPV}" > >-SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" > >+PV_ti-soc = "3.19.0+git${SRCPV}" > >+SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" > > optee-client will not build against this SRCREV. They added a call > to pkg-config which is not readily available to the recipe without a > change to your patch. > > You need to add: > > DEPENDS += "pkgconfig" You probably don't want a target pkgconfig, but a native one. Do this instead: inherit pkgconfig > Please do so and resubmit the patch. > > > >diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend > >index 9941b345..dda7cbbf 100644 > >--- a/recipes-security/optee/optee-examples_%.bbappend > >+++ b/recipes-security/optee/optee-examples_%.bbappend > >@@ -1,5 +1,5 @@ > >-PV_ti-soc = "3.17.0+git${SRCPV}" > >-SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" > >+PV_ti-soc = "3.19.0+git${SRCPV}" > >+SRCREV_ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65" > > SRC_URI_ti-soc = "git://github.com/linaro-swg/optee_examples.git;protocol=https" > > DEPENDS_append_ti-soc = " python3-cryptography-native" > >diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend > >index d81ae521..79b4b4d6 100644 > >--- a/recipes-security/optee/optee-test_%.bbappend > >+++ b/recipes-security/optee/optee-test_%.bbappend > >@@ -1,5 +1,5 @@ > >-PV_ti-soc = "3.17.0+git${SRCPV}" > >-SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" > >+PV_ti-soc = "3.19.0+git${SRCPV}" > >+SRCREV_ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db" > > SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" > > DEPENDS_append_ti-soc = " python3-cryptography-native" > > -- > Ryan Eatmon reatmon@ti.com > ----------------------------------------- > Texas Instruments, Inc. - LCPD - MGTS > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#15397): https://lists.yoctoproject.org/g/meta-ti/message/15397 > Mute This Topic: https://lists.yoctoproject.org/mt/95403088/3617104 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [denis@denix.org] > -=-=-=-=-=-=-=-=-=-=-=- >
On 12/3/2022 9:48, Denys Dmytriyenko wrote: > On Fri, Dec 02, 2022 at 08:04:52PM -0600, Ryan Eatmon via lists.yoctoproject.org wrote: >> >> >> On 12/2/2022 4:04, Manorit Chawdhry wrote: >>> optee-os was updated to 3.19 tag but the others were still outdated. >>> >>> Updates other optee components to 3.19 tag >>> >>> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> >>> --- >>> recipes-security/optee/optee-client_%.bbappend | 4 ++-- >>> recipes-security/optee/optee-examples_%.bbappend | 4 ++-- >>> recipes-security/optee/optee-test_%.bbappend | 4 ++-- >>> 3 files changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend >>> index 5675570a..6737ba92 100644 >>> --- a/recipes-security/optee/optee-client_%.bbappend >>> +++ b/recipes-security/optee/optee-client_%.bbappend >>> @@ -1,2 +1,2 @@ >>> -PV_ti-soc = "3.17.0+git${SRCPV}" >>> -SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>> +PV_ti-soc = "3.19.0+git${SRCPV}" >>> +SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" >> >> optee-client will not build against this SRCREV. They added a call >> to pkg-config which is not readily available to the recipe without a >> change to your patch. >> >> You need to add: >> >> DEPENDS += "pkgconfig" > > You probably don't want a target pkgconfig, but a native one. > Do this instead: > > inherit pkgconfig Actually, I thought that at first too and tried all variations of the native (inherit, depends, hosttools, etc...). The only thing that actually made it work was the above. In this case, pkg-config is not being called from configure, but from the Makefile. The Makefile is trying to make sure that libuuid is installed for the target. And the native would only make sure it is installed on the native side, where as pkgconfig for target looks in all of the places for the target library. At least that was my understanding in reading online docs about it. But depending on pkgconfig (for target) actually fixed the compile issue. If you want to verify that or disprove it I would be most appreciative. I spent a few hours banging my head on this one. >> Please do so and resubmit the patch. >> >> >>> diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend >>> index 9941b345..dda7cbbf 100644 >>> --- a/recipes-security/optee/optee-examples_%.bbappend >>> +++ b/recipes-security/optee/optee-examples_%.bbappend >>> @@ -1,5 +1,5 @@ >>> -PV_ti-soc = "3.17.0+git${SRCPV}" >>> -SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >>> +PV_ti-soc = "3.19.0+git${SRCPV}" >>> +SRCREV_ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65" >>> SRC_URI_ti-soc = "git://github.com/linaro-swg/optee_examples.git;protocol=https" >>> DEPENDS_append_ti-soc = " python3-cryptography-native" >>> diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend >>> index d81ae521..79b4b4d6 100644 >>> --- a/recipes-security/optee/optee-test_%.bbappend >>> +++ b/recipes-security/optee/optee-test_%.bbappend >>> @@ -1,5 +1,5 @@ >>> -PV_ti-soc = "3.17.0+git${SRCPV}" >>> -SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >>> +PV_ti-soc = "3.19.0+git${SRCPV}" >>> +SRCREV_ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db" >>> SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" >>> DEPENDS_append_ti-soc = " python3-cryptography-native" >> >> -- >> Ryan Eatmon reatmon@ti.com >> ----------------------------------------- >> Texas Instruments, Inc. - LCPD - MGTS > >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#15397): https://lists.yoctoproject.org/g/meta-ti/message/15397 >> Mute This Topic: https://lists.yoctoproject.org/mt/95403088/3617104 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [denis@denix.org] >> -=-=-=-=-=-=-=-=-=-=-=- >> > >
On Sat, Dec 03, 2022 at 11:04:00AM -0600, Ryan Eatmon wrote: > > > On 12/3/2022 9:48, Denys Dmytriyenko wrote: > >On Fri, Dec 02, 2022 at 08:04:52PM -0600, Ryan Eatmon via lists.yoctoproject.org wrote: > >> > >> > >>On 12/2/2022 4:04, Manorit Chawdhry wrote: > >>>optee-os was updated to 3.19 tag but the others were still outdated. > >>> > >>>Updates other optee components to 3.19 tag > >>> > >>>Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> > >>>--- > >>> recipes-security/optee/optee-client_%.bbappend | 4 ++-- > >>> recipes-security/optee/optee-examples_%.bbappend | 4 ++-- > >>> recipes-security/optee/optee-test_%.bbappend | 4 ++-- > >>> 3 files changed, 6 insertions(+), 6 deletions(-) > >>> > >>>diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend > >>>index 5675570a..6737ba92 100644 > >>>--- a/recipes-security/optee/optee-client_%.bbappend > >>>+++ b/recipes-security/optee/optee-client_%.bbappend > >>>@@ -1,2 +1,2 @@ > >>>-PV_ti-soc = "3.17.0+git${SRCPV}" > >>>-SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" > >>>+PV_ti-soc = "3.19.0+git${SRCPV}" > >>>+SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" > >> > >>optee-client will not build against this SRCREV. They added a call > >>to pkg-config which is not readily available to the recipe without a > >>change to your patch. > >> > >>You need to add: > >> > >>DEPENDS += "pkgconfig" > > > >You probably don't want a target pkgconfig, but a native one. > >Do this instead: > > > >inherit pkgconfig > > Actually, I thought that at first too and tried all variations of > the native (inherit, depends, hosttools, etc...). The only thing > that actually made it work was the above. > > In this case, pkg-config is not being called from configure, but > from the Makefile. The Makefile is trying to make sure that libuuid > is installed for the target. And the native would only make sure it > is installed on the native side, where as pkgconfig for target looks > in all of the places for the target library. At least that was my > understanding in reading online docs about it. > > But depending on pkgconfig (for target) actually fixed the compile > issue. If you want to verify that or disprove it I would be most > appreciative. I spent a few hours banging my head on this one. Looks like you've done your research - it's a bit strange use of pkgconfig by optee-client, not a basic normal use case I was referring to. If the Makefile is trying to check if libuuid is installed, don't you need to also have it the DEPENDS? And we'll see how meta-arm/master handles it soon enough, when updating to 3.19 upstream...
On 12/4/2022 16:56, Denys Dmytriyenko wrote: > On Sat, Dec 03, 2022 at 11:04:00AM -0600, Ryan Eatmon wrote: >> >> >> On 12/3/2022 9:48, Denys Dmytriyenko wrote: >>> On Fri, Dec 02, 2022 at 08:04:52PM -0600, Ryan Eatmon via lists.yoctoproject.org wrote: >>>> >>>> >>>> On 12/2/2022 4:04, Manorit Chawdhry wrote: >>>>> optee-os was updated to 3.19 tag but the others were still outdated. >>>>> >>>>> Updates other optee components to 3.19 tag >>>>> >>>>> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> >>>>> --- >>>>> recipes-security/optee/optee-client_%.bbappend | 4 ++-- >>>>> recipes-security/optee/optee-examples_%.bbappend | 4 ++-- >>>>> recipes-security/optee/optee-test_%.bbappend | 4 ++-- >>>>> 3 files changed, 6 insertions(+), 6 deletions(-) >>>>> >>>>> diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend >>>>> index 5675570a..6737ba92 100644 >>>>> --- a/recipes-security/optee/optee-client_%.bbappend >>>>> +++ b/recipes-security/optee/optee-client_%.bbappend >>>>> @@ -1,2 +1,2 @@ >>>>> -PV_ti-soc = "3.17.0+git${SRCPV}" >>>>> -SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>>>> +PV_ti-soc = "3.19.0+git${SRCPV}" >>>>> +SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" >>>> >>>> optee-client will not build against this SRCREV. They added a call >>>> to pkg-config which is not readily available to the recipe without a >>>> change to your patch. >>>> >>>> You need to add: >>>> >>>> DEPENDS += "pkgconfig" >>> >>> You probably don't want a target pkgconfig, but a native one. >>> Do this instead: >>> >>> inherit pkgconfig >> >> Actually, I thought that at first too and tried all variations of >> the native (inherit, depends, hosttools, etc...). The only thing >> that actually made it work was the above. >> >> In this case, pkg-config is not being called from configure, but >> from the Makefile. The Makefile is trying to make sure that libuuid >> is installed for the target. And the native would only make sure it >> is installed on the native side, where as pkgconfig for target looks >> in all of the places for the target library. At least that was my >> understanding in reading online docs about it. >> >> But depending on pkgconfig (for target) actually fixed the compile >> issue. If you want to verify that or disprove it I would be most >> appreciative. I spent a few hours banging my head on this one. > > Looks like you've done your research - it's a bit strange use of pkgconfig > by optee-client, not a basic normal use case I was referring to. > > If the Makefile is trying to check if libuuid is installed, don't you need to > also have it the DEPENDS? > > And we'll see how meta-arm/master handles it soon enough, when updating to > 3.19 upstream... > I was thinking about the libuuid dependency over the weekend. And I agree, I can't wait to see how upstream meta-arm handles this. Luckily this is just a "temporary" patch to get it working for us since our preference is to get upstream to handle things like this and not carry patches like this in the long term in meta-ti.
diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend index 5675570a..6737ba92 100644 --- a/recipes-security/optee/optee-client_%.bbappend +++ b/recipes-security/optee/optee-client_%.bbappend @@ -1,2 +1,2 @@ -PV_ti-soc = "3.17.0+git${SRCPV}" -SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" +PV_ti-soc = "3.19.0+git${SRCPV}" +SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend index 9941b345..dda7cbbf 100644 --- a/recipes-security/optee/optee-examples_%.bbappend +++ b/recipes-security/optee/optee-examples_%.bbappend @@ -1,5 +1,5 @@ -PV_ti-soc = "3.17.0+git${SRCPV}" -SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" +PV_ti-soc = "3.19.0+git${SRCPV}" +SRCREV_ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65" SRC_URI_ti-soc = "git://github.com/linaro-swg/optee_examples.git;protocol=https" DEPENDS_append_ti-soc = " python3-cryptography-native" diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend index d81ae521..79b4b4d6 100644 --- a/recipes-security/optee/optee-test_%.bbappend +++ b/recipes-security/optee/optee-test_%.bbappend @@ -1,5 +1,5 @@ -PV_ti-soc = "3.17.0+git${SRCPV}" -SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" +PV_ti-soc = "3.19.0+git${SRCPV}" +SRCREV_ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db" SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" DEPENDS_append_ti-soc = " python3-cryptography-native"
optee-os was updated to 3.19 tag but the others were still outdated. Updates other optee components to 3.19 tag Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> --- recipes-security/optee/optee-client_%.bbappend | 4 ++-- recipes-security/optee/optee-examples_%.bbappend | 4 ++-- recipes-security/optee/optee-test_%.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)