[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3980/8267] image_types.bbclass: look for wks files in <layer>/wic

[Emmanuele Bassi <ebassi src gnome org>]

commit 8f38e7686110b5c6a01ee441a8a0e6cf87f7b4d7
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Dec 23 01:42:14 2016 +0200

    image_types.bbclass: look for wks files in <layer>/wic
    
    Added <layer>/wic directory to the list of paths to look
    for wks files. This makes wic behaviour consistent when
    invoked manually and by bitbake.
    
    (From OE-Core rev: d345985db69dc86e9a8f8e2506b250d8780374cb)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 8f04849..b526cfa 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -186,7 +186,7 @@ IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME
 
 WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
 WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
-WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in 
'${BBPATH}:${COREBASE}'.split(':'))}"
+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 ''}"
 
 def wks_search(files, search_path):