From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] image_types_wic: fix expansion error
Date: Wed, 22 Feb 2017 13:12:29 +0200 [thread overview]
Message-ID: <1487761949-13456-1-git-send-email-ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <CA+chaQegXmqfE=3TmnYXvLdCW00QpinkXk=L27OQS5-1DnJYAQ@mail.gmail.com>
Variable WKS_SEARCH_PATH was not fully expanded when used directly
in this expression:
WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"
This caused expansion error: bb.data_smart.ExpansionError: Failure expanding variable WKS_FULL_PATH,
.... which triggered exception SyntaxError: invalid syntax (WKS_FULL_PATH, line 1)
Using d.getVar('WKS_SEARCH_PATH') instead of directly referencing
WKS_SEARCH_PATH variable should fix the issue.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/classes/image_types_wic.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 43b2917..c6e92fb 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -8,7 +8,7 @@ WICVARS ?= "\
WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/wic' % p for p in '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}"
-WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"
+WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), d.getVar('WKS_SEARCH_PATH')) or ''}"
def wks_search(files, search_path):
for f in files:
--
2.1.4
next prev parent reply other threads:[~2017-02-22 11:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 8:39 core-image-tiny-initramfs failing to parse because of WIC (WKS_FULL_PATH, ) Martin Jansa
[not found] ` <20170215085849.GA6218@linux.intel.com>
2017-02-18 0:16 ` Martin Jansa
2017-02-21 17:05 ` Martin Jansa
2017-02-22 11:12 ` Ed Bartosh [this message]
2017-02-22 11:59 ` [PATCH] image_types_wic: fix expansion error Martin Jansa
2017-02-22 12:01 ` Burton, Ross
2017-02-22 14:39 ` [PATCH v2] " Ed Bartosh
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=1487761949-13456-1-git-send-email-ed.bartosh@linux.intel.com \
--to=ed.bartosh@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/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