[PATCH] Fix wrong inline python in isar-image.bbclass

[PATCH] Fix wrong inline python in isar-image.bbclass

[Andreas J. Reichel]

From: Andreas Reichel <andreas.reichel.ext@siemens.com>

The inline python string used a mixture of python
and shell, which failed while parsing recipes with:

The URL: '${@' is invalid and cannot be interpreted

Problem is that in

SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }"

${DISTRO_CONFIG_SCRIPT} is not interpreted correctly.
Use d.getVar instead.

Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
---
 meta/classes/isar-image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index 754e896..b6f8848 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -7,7 +7,7 @@ inherit image
 inherit isar-bootstrap-helper
 
 FILESPATH =. "${LAYERDIR_isar}/conf/distro:"
-SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }"
+SRC_URI += "${@ d.getVar('DISTRO_CONFIG_SCRIPT', True) or '' }"
 
 DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}"
 
-- 
2.20.1

Re: [PATCH] Fix wrong inline python in isar-image.bbclass

[Henning Schild]

Am Thu, 10 Jan 2019 13:33:15 +0100
schrieb "[ext] Andreas J. Reichel" <andreas.reichel.ext@siemens.com>:

> From: Andreas Reichel <andreas.reichel.ext@siemens.com>
> 
> The inline python string used a mixture of python
> and shell, which failed while parsing recipes with:
> 
> The URL: '${@' is invalid and cannot be interpreted
> 
> Problem is that in
> 
> SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if
> '${DISTRO_CONFIG_SCRIPT}' else '' }"
> 
> ${DISTRO_CONFIG_SCRIPT} is not interpreted correctly.
> Use d.getVar instead.
> 
> Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
> ---
>  meta/classes/isar-image.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/isar-image.bbclass
> b/meta/classes/isar-image.bbclass index 754e896..b6f8848 100644
> --- a/meta/classes/isar-image.bbclass
> +++ b/meta/classes/isar-image.bbclass
> @@ -7,7 +7,7 @@ inherit image
>  inherit isar-bootstrap-helper
>  
>  FILESPATH =. "${LAYERDIR_isar}/conf/distro:"
> -SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if
> '${DISTRO_CONFIG_SCRIPT}' else '' }" +SRC_URI += "${@
> d.getVar('DISTRO_CONFIG_SCRIPT', True) or '' }" 
>  DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}"

Where did the file:// go, or is it not needed?

Henning

Re: [PATCH] Fix wrong inline python in isar-image.bbclass

[Andreas Reichel]

On Thu, Jan 10, 2019 at 02:31:56PM +0100, Henning Schild wrote:
> Am Thu, 10 Jan 2019 13:33:15 +0100
> schrieb "[ext] Andreas J. Reichel" <andreas.reichel.ext@siemens.com>:
> 
> > From: Andreas Reichel <andreas.reichel.ext@siemens.com>
> > 
> > The inline python string used a mixture of python
> > and shell, which failed while parsing recipes with:
> > 
> > The URL: '${@' is invalid and cannot be interpreted
> > 
> > Problem is that in
> > 
> > SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if
> > '${DISTRO_CONFIG_SCRIPT}' else '' }"
> > 
> > ${DISTRO_CONFIG_SCRIPT} is not interpreted correctly.
> > Use d.getVar instead.
> > 
> > Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>
> > ---
> >  meta/classes/isar-image.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/isar-image.bbclass
> > b/meta/classes/isar-image.bbclass index 754e896..b6f8848 100644
> > --- a/meta/classes/isar-image.bbclass
> > +++ b/meta/classes/isar-image.bbclass
> > @@ -7,7 +7,7 @@ inherit image
> >  inherit isar-bootstrap-helper
> >  
> >  FILESPATH =. "${LAYERDIR_isar}/conf/distro:"
> > -SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if
> > '${DISTRO_CONFIG_SCRIPT}' else '' }" +SRC_URI += "${@
> > d.getVar('DISTRO_CONFIG_SCRIPT', True) or '' }" 
> >  DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}"
> 
> Where did the file:// go, or is it not needed?
> 
Thanks I just saw that because I got a new error. Sorry. I am fixing
that. Before it was deployed and therefore it did not warn nor error.

> Henning
> 

-- 
Andreas Reichel
Dipl.-Phys. (Univ.)
Software Consultant

Andreas.Reichel@tngtech.com, +49-174-3180074
TNG Technology Consulting GmbH, Betastr. 13a, 85774 Unterfoehring
Geschaeftsfuehrer: Henrik Klagges, Dr. Robert Dahlke, Gerhard Mueller
Sitz: Unterfoehring * Amtsgericht Muenchen * HRB 135082