From: "Andreas J. Reichel" <andreas.reichel.ext@siemens.com>
To: isar-users@googlegroups.com
Cc: Andreas Reichel <andreas.reichel.ext@siemens.com>
Subject: [PATCH v2] Fix wrong inline python in isar-image.bbclass
Date: Thu, 10 Jan 2019 16:03:51 +0100 [thread overview]
Message-ID: <20190110150351.27270-1-andreas.reichel.ext@siemens.com> (raw)
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 | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index 754e896..e221ba6 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -6,8 +6,14 @@
inherit image
inherit isar-bootstrap-helper
+def cfg_script(d):
+ cf = d.getVar('DISTRO_CONFIG_SCRIPT', True) or ''
+ if cf:
+ return 'file://' + cf
+ return ''
+
FILESPATH =. "${LAYERDIR_isar}/conf/distro:"
-SRC_URI += "${@ 'file://${DISTRO_CONFIG_SCRIPT}' if '${DISTRO_CONFIG_SCRIPT}' else '' }"
+SRC_URI += "${@ cfg_script(d) }"
DEPENDS += "${IMAGE_INSTALL} ${IMAGE_TRANSIENT_PACKAGES}"
--
2.20.1
next reply other threads:[~2019-01-10 15:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 15:03 Andreas J. Reichel [this message]
2019-01-10 15:31 ` Claudius Heine
2019-01-18 7:53 ` Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190110150351.27270-1-andreas.reichel.ext@siemens.com \
--to=andreas.reichel.ext@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox