summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-12-23 01:42:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:11 +0000
commit8f38e7686110b5c6a01ee441a8a0e6cf87f7b4d7 (patch)
tree05a1ee8bed77958ae949f2382620fdd3fdc500bf
parentc6e41018df2f3f75be7707ff3f7aea929d6e7dbd (diff)
downloadpoky-8f38e7686110b5c6a01ee441a8a0e6cf87f7b4d7.tar.gz
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>
-rw-r--r--meta/classes/image_types.bbclass2
1 files changed, 1 insertions, 1 deletions
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
186 186
187WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" 187WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
188WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" 188WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
189WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}" 189WKS_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(':'))}"
190WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}" 190WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"
191 191
192def wks_search(files, search_path): 192def wks_search(files, search_path):