Re: [meta-arm][PATCH 2/3] optee-ftpm/optee-os: rewite in a way to be less error prone

[Jose Quaresma <quaresma.jose@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2143 bytes --]

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
>


-- 
Best regards,

José Quaresma

[-- Attachment #2: Type: text/html, Size: 3671 bytes --]