On Mon, Dec 12, 2022 at 11:42:37AM +0530, Manorit Chawdhry wrote: > On 00:55-20221212, Denys Dmytriyenko wrote: > > On Mon, Dec 12, 2022 at 11:17:05AM +0530, Manorit Chawdhry via > > lists.yoctoproject.org 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 <[email protected]> > > > --- > > > v1->v2: > > > - Fix build by adding depends > > > > > > recipes-security/optee/optee-client_%.bbappend | 6 ++++-- > > > recipes-security/optee/optee-examples_%.bbappend | 4 ++-- > > > recipes-security/optee/optee-test_%.bbappend | 4 ++-- > > > 3 files changed, 8 insertions(+), 6 deletions(-) > > > > > > diff --git a/recipes-security/optee/optee-client_%.bbappend > > > b/recipes-security/optee/optee-client_%.bbappend > > > index 5675570a..19feaf6d 100644 > > > --- a/recipes-security/optee/optee-client_%.bbappend > > > +++ b/recipes-security/optee/optee-client_%.bbappend > > > @@ -1,2 +1,4 @@ > > > -PV_ti-soc = "3.17.0+git${SRCPV}" > > > -SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" > > > +PV_ti-soc = "3.19.0+git${SRCPV}" > > > +SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951" > > > + > > > +DEPENDS += "pkgconfig" > > > > NAK - any unconditional change of the upstream package will break YP compat > > for meta-ti. Please see how it's done correctly - this patch actually > > captures > > 2 such cases below... > > > > Ah okay, I see upstream including some patches to fix this one. Will update > the > SHA once it's done.
Well, they are moving the uuid check around, but it still requires cross version of pkg-config and hence needs the above DEPENDNS: https://github.com/OP-TEE/optee_client/commit/dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc But what I meant before - you cannot simply use DEPENDS in a bbappend that alters upstream recipe unconditionally. You have to guard it with some layer-specific override - see below. > > > 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" E.g. here > > > 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" Oe here -- Denys
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15454): https://lists.yoctoproject.org/g/meta-ti/message/15454 Mute This Topic: https://lists.yoctoproject.org/mt/95615749/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
