diff mbox series

[meta-arm,3/3] optee-os-ts: avoid using escape chars in EXTRA_OEMAKE

Message ID 20221026141854.1557213-3-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
This currently can break the bitbake parsing

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta-arm/recipes-security/optee/optee-os-ts.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

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

On Wed, Oct 26, 2022 at 02:18:54PM +0000, Jose Quaresma wrote:
> This currently can break the bitbake parsing
> 
> Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> ---
>  meta-arm/recipes-security/optee/optee-os-ts.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arm/recipes-security/optee/optee-os-ts.inc b/meta-arm/recipes-security/optee/optee-os-ts.inc
> index 10a41755..73b8c14f 100644
> --- a/meta-arm/recipes-security/optee/optee-os-ts.inc
> +++ b/meta-arm/recipes-security/optee/optee-os-ts.inc
> @@ -51,4 +51,4 @@ DEPENDS:append  = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
>  SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
>                                          ' ${TS_BIN}/${SMM_GATEWAY_UUID}.stripped.elf', '', d)}"
>  
> -EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS=\'${SP_PATHS}\' ', d)}"
> +EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS="${SP_PATHS}" ', d)}"

Use plain += instead of :append.

Cheers,

-Mikko
Jon Mason Oct. 27, 2022, 2:06 p.m. UTC | #2
On Thu, Oct 27, 2022 at 09:20:24AM +0300, Mikko Rapeli wrote:
> Hi,
> 
> On Wed, Oct 26, 2022 at 02:18:54PM +0000, Jose Quaresma wrote:
> > This currently can break the bitbake parsing
> > 
> > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> > ---
> >  meta-arm/recipes-security/optee/optee-os-ts.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta-arm/recipes-security/optee/optee-os-ts.inc b/meta-arm/recipes-security/optee/optee-os-ts.inc
> > index 10a41755..73b8c14f 100644
> > --- a/meta-arm/recipes-security/optee/optee-os-ts.inc
> > +++ b/meta-arm/recipes-security/optee/optee-os-ts.inc
> > @@ -51,4 +51,4 @@ DEPENDS:append  = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
> >  SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
> >                                          ' ${TS_BIN}/${SMM_GATEWAY_UUID}.stripped.elf', '', d)}"
> >  
> > -EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS=\'${SP_PATHS}\' ', d)}"
> > +EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS="${SP_PATHS}" ', d)}"
> 
> Use plain += instead of :append.

He's using the existing style.  I think his change was the least
disruptive (than changing append to +=).

Thanks,
Jon

> 
> Cheers,
> 
> -Mikko
>
diff mbox series

Patch

diff --git a/meta-arm/recipes-security/optee/optee-os-ts.inc b/meta-arm/recipes-security/optee/optee-os-ts.inc
index 10a41755..73b8c14f 100644
--- a/meta-arm/recipes-security/optee/optee-os-ts.inc
+++ b/meta-arm/recipes-security/optee/optee-os-ts.inc
@@ -51,4 +51,4 @@  DEPENDS:append  = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
 SP_PATHS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', \
                                         ' ${TS_BIN}/${SMM_GATEWAY_UUID}.stripped.elf', '', d)}"
 
-EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS=\'${SP_PATHS}\' ', d)}"
+EXTRA_OEMAKE:append = "${@oe.utils.conditional('SP_PATHS', '', '', ' CFG_SECURE_PARTITION=y SP_PATHS="${SP_PATHS}" ', d)}"