diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-22 16:39:35 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-23 12:29:10 -0800 |
| commit | 20f8fddd28fe46d7e694804de3d894cdf9f7c636 (patch) | |
| tree | 7ad72e3d16282174f2df04fb9617172e5912c85d /meta/classes | |
| parent | def3800c7e58d9d1b54ea1df27b190a0f6d1d544 (diff) | |
| download | openembedded-core-20f8fddd28fe46d7e694804de3d894cdf9f7c636.tar.gz openembedded-core-20f8fddd28fe46d7e694804de3d894cdf9f7c636.tar.bz2 openembedded-core-20f8fddd28fe46d7e694804de3d894cdf9f7c636.zip | |
image_types_wic: fix expansion error
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)
Calling d.getVar instead of directly referencing variables
should fix the issue.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index ec6c14d4e6..d012a5d5ca 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(d.getVar('WKS_FILES').split(), d.getVar('WKS_SEARCH_PATH')) or ''}" def wks_search(files, search_path): for f in files: |