[OE-core] [PATCH] image_types_wic: fix expansion error

[Martin Jansa]

On Wed, Feb 22, 2017 at 01:12:29PM +0200, Ed Bartosh wrote:
> 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.

Allows me to parse oe-core again, thanks!

Acked-by: Martin Jansa <Martin.Jansa at gmail.com>

> Signed-off-by: Ed Bartosh <ed.bartosh at 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
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170222/8cc01074/attachment-0002.sig>