summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2016-10-14 09:46:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-25 17:58:59 +0100
commit30d1af89ce2a2fb30f32a898ec12c9a51db57013 (patch)
tree5b08b2b3f7a2f815999dee37e0b3e7154d1d36ca /meta
parent69e8c1a8884dbb325d5947a9a079b32fcb61df90 (diff)
downloadpoky-30d1af89ce2a2fb30f32a898ec12c9a51db57013.tar.gz
image_types: Use softer setting of WKS_FILE
This will allow for more flexibility and overrides in BSP layers. (From OE-Core rev: 1886ab2f1dc1e3b5758a85604998e8deb9198f5e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 a7fffbce06..1ce8334e3a 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -184,7 +184,7 @@ IMAGE_CMD_ubi () {
184 184
185IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" 185IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}"
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/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 ''}"