diff mbox series

[meta-arm,1/3] optee-ftpm/optee-os: add missing space in EXTRA_OEMAKE

Message ID 20221026141854.1557213-1-jose.quaresma@foundries.io
State New
Headers show
Series [meta-arm,1/3] optee-ftpm/optee-os: add missing space in EXTRA_OEMAKE | expand

Commit Message

Jose Quaresma Oct. 26, 2022, 2:18 p.m. UTC
When append to variable a space is required at the beginning.

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Mikko Rapeli Oct. 27, 2022, 6:18 a.m. UTC | #1
Hi,

On Wed, Oct 26, 2022 at 02:18:52PM +0000, Jose Quaresma wrote:
> When append to variable a space is required at the beginning.
> 
> Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> ---
>  meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> index acea7502..40423615 100644
> --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> @@ -7,7 +7,8 @@ DEPENDS:append = "\
>                   '' , \
>                   d)}"
>  
> -EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
> +EXTRA_OEMAKE:append = "\

There is no need to use :append here. += will do and will add the
space.

Using :append everywhere without machine or distro qualifiers is
an annoying antipattern which intermediate layers should not use.

Higher level product specific layers can't easily change the variables
which have been amended with :append.

Cheers,

-Mikko
Jose Quaresma Oct. 27, 2022, 8:57 a.m. UTC | #2
Hi Mikko,

Mikko Rapeli <mikko.rapeli@linaro.org> escreveu no dia quinta, 27/10/2022
à(s) 07:18:

> Hi,
>
> On Wed, Oct 26, 2022 at 02:18:52PM +0000, Jose Quaresma wrote:
> > When append to variable a space is required at the beginning.
> >
> > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> > ---
> >  meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> > index acea7502..40423615 100644
> > --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> > +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
> > @@ -7,7 +7,8 @@ DEPENDS:append = "\
> >                   '' , \
> >                   d)}"
> >
> > -EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
> > +EXTRA_OEMAKE:append = "\
>
> There is no need to use :append here. += will do and will add the
> space.


Right, I can use the += but in this case I follow this pattern to make the
change consistent
with what already existed in the file. I can change it, let's see the
maintainer's opinion.


>
> Using :append everywhere without machine or distro qualifiers is
> an annoying antipattern which intermediate layers should not use.
>
> Higher level product specific layers can't easily change the variables
> which have been amended with :append.
>

This will always be tricky to do, a lot due to the freedom of bitbake
syntax.
With :append usage we need to use the :remove because this needs to be done
at the end of the parsing.
While with += you can assign a new value for the variable during parsing
but you will lose all the others that had already possible been added with
+=

Great to talk with you again about bitbake stuff ;)

Jose


> Cheers,
>
> -Mikko
>
Jon Mason Oct. 27, 2022, 9:38 p.m. UTC | #3
On Wed, 26 Oct 2022 14:18:52 +0000, Jose Quaresma wrote:
> When append to variable a space is required at the beginning.

Applied, thanks!

[1/3] optee-ftpm/optee-os: add missing space in EXTRA_OEMAKE
      commit: 518294d518968a9f8895a17c5d6d0f1a95246ef3
[2/3] optee-ftpm/optee-os: rewite in a way to be less error prone
      (no commit info)
[3/3] optee-os-ts: avoid using escape chars in EXTRA_OEMAKE
      commit: 3080a94bde5a2f316960bc6a6c649f798a76e239

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
index acea7502..40423615 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
+++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
@@ -7,7 +7,8 @@  DEPENDS:append = "\
                  '' , \
                  d)}"
 
-EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
+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"', \
                       '', \