From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Thu, 22 Dec 2016 23:42:14 +0000 (+0200)
Subject: image_types.bbclass: look for wks files in <layer>/wic
X-Git-Tag: uninative-1.5~906
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d345985db69dc86e9a8f8e2506b250d8780374cb;p=openembedded-core.git

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.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 8f048497a1..b526cfaa3a 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):