| Message ID | 20221026141854.1557213-2-jose.quaresma@foundries.io |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-arm,1/3] optee-ftpm/optee-os: add missing space in EXTRA_OEMAKE | expand |
Hi, On Wed, Oct 26, 2022 at 02:18:53PM +0000, Jose Quaresma wrote: > So it becomes clearer the need to use the space in the append > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > --- > .../optee-ftpm/optee-os_%.bbappend | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > index 40423615..332c7c1c 100644 > --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > @@ -1,15 +1,7 @@ > FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" > > -DEPENDS:append = "\ > - ${@bb.utils.contains('MACHINE_FEATURES', \ > - 'optee-ftpm', \ > - 'optee-ftpm', \ > - '' , \ > - d)}" > +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ Same here, don't use :append, use += which will add the space too. > + ' optee-ftpm', '' , d)}" > > -EXTRA_OEMAKE:append = "\ > - ${@bb.utils.contains('MACHINE_FEATURES', \ > - 'optee-ftpm', \ > - 'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \ > - '', \ > - d)} " > +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ Ditto. Cheers, -Mikko
Hi Mikko Rapeli <mikko.rapeli@linaro.org> escreveu no dia quinta, 27/10/2022 à(s) 07:19: > Hi, > > On Wed, Oct 26, 2022 at 02:18:53PM +0000, Jose Quaresma wrote: > > So it becomes clearer the need to use the space in the append > > > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > --- > > .../optee-ftpm/optee-os_%.bbappend | 16 ++++------------ > > 1 file changed, 4 insertions(+), 12 deletions(-) > > > > diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > > index 40423615..332c7c1c 100644 > > --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > > +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > > @@ -1,15 +1,7 @@ > > FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" > > > > -DEPENDS:append = "\ > > - ${@bb.utils.contains('MACHINE_FEATURES', \ > > - 'optee-ftpm', \ > > - 'optee-ftpm', \ > > - '' , \ > > - d)}" > > +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', > 'optee-ftpm', \ > > Same here, don't use :append, use += which will add the space too. > > > + ' optee-ftpm', '' , d)}" > Here the space is only added if needed and together with the value. > > > > -EXTRA_OEMAKE:append = "\ > > - ${@bb.utils.contains('MACHINE_FEATURES', \ > > - 'optee-ftpm', \ > > - 'CFG_EARLY_TA=y > EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', > \ > > - '', \ > > - d)} " > > +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', > 'optee-ftpm', \ > > Ditto. > +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ + ' CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_ TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', '', d)} " The same here Jose > > Cheers, > > -Mikko >
On Wed, Oct 26, 2022 at 02:18:53PM +0000, Jose Quaresma wrote: > So it becomes clearer the need to use the space in the append > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > --- > .../optee-ftpm/optee-os_%.bbappend | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > index 40423615..332c7c1c 100644 > --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > @@ -1,15 +1,7 @@ > FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" > > -DEPENDS:append = "\ > - ${@bb.utils.contains('MACHINE_FEATURES', \ > - 'optee-ftpm', \ > - 'optee-ftpm', \ > - '' , \ > - d)}" > +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ > + ' optee-ftpm', '' , d)}" > > -EXTRA_OEMAKE:append = "\ > - ${@bb.utils.contains('MACHINE_FEATURES', \ > - 'optee-ftpm', \ > - 'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \ > - '', \ > - d)} " > +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ > + ' CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', '', d)} " > -- > 2.34.1 > > This is a "style" patch, and doesn't really fix an issue. I believe there are other instances of this in the tree. If you were to do a patch (or more likely a series of patches) that unifies all of the recipes to have a unified style, I'd be more inclined to take it (but honestly I don't think that is a good use of your time). The other two of the series look to fix bugs and I'll pull those in. Thank you for the patches :) Thanks, Jon
Hi Jon, Jon Mason <jdmason@kudzu.us> escreveu no dia quinta, 27/10/2022 à(s) 15:03: > On Wed, Oct 26, 2022 at 02:18:53PM +0000, Jose Quaresma wrote: > > So it becomes clearer the need to use the space in the append > > > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > --- > > .../optee-ftpm/optee-os_%.bbappend | 16 ++++------------ > > 1 file changed, 4 insertions(+), 12 deletions(-) > > > > diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > > index 40423615..332c7c1c 100644 > > --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > > +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend > > @@ -1,15 +1,7 @@ > > FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" > > > > -DEPENDS:append = "\ > > - ${@bb.utils.contains('MACHINE_FEATURES', \ > > - 'optee-ftpm', \ > > - 'optee-ftpm', \ > > - '' , \ > > - d)}" > > +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', > 'optee-ftpm', \ > > + ' optee-ftpm', '' , d)}" > > > > -EXTRA_OEMAKE:append = "\ > > - ${@bb.utils.contains('MACHINE_FEATURES', \ > > - 'optee-ftpm', \ > > - 'CFG_EARLY_TA=y > EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', > \ > > - '', \ > > - d)} " > > +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', > 'optee-ftpm', \ > > + ' CFG_EARLY_TA=y > EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', > '', d)} " > > -- > > 2.34.1 > > > > > > This is a "style" patch, and doesn't really fix an issue. I believe > there are other instances of this in the tree. If you were to do a > patch (or more likely a series of patches) that unifies all of the > recipes to have a unified style, I'd be more inclined to take it (but > honestly I don't think that is a good use of your time). > Right, I changed the style because I am fixing a bug in the same file but yeah this patch doesn't fix any issue and can be dropped. > > The other two of the series look to fix bugs and I'll pull those in. > Thank you for the patches :) > It's my pleasure. Jose > > Thanks, > Jon > >
diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend index 40423615..332c7c1c 100644 --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend @@ -1,15 +1,7 @@ FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" -DEPENDS:append = "\ - ${@bb.utils.contains('MACHINE_FEATURES', \ - 'optee-ftpm', \ - 'optee-ftpm', \ - '' , \ - d)}" +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ + ' optee-ftpm', '' , d)}" -EXTRA_OEMAKE:append = "\ - ${@bb.utils.contains('MACHINE_FEATURES', \ - 'optee-ftpm', \ - 'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \ - '', \ - d)} " +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-ftpm', \ + ' CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', '', d)} "
So it becomes clearer the need to use the space in the append Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> --- .../optee-ftpm/optee-os_%.bbappend | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)