summaryrefslogtreecommitdiffstats
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:41 +0100
commit1886ab2f1dc1e3b5758a85604998e8deb9198f5e (patch)
tree57ff5ea570690dbc802555889039a0b69c0964e7
parentb4929542ff01a24bea5edd1c40e3174f55e213ff (diff)
downloadopenembedded-core-contrib-1886ab2f1dc1e3b5758a85604998e8deb9198f5e.tar.gz
openembedded-core-contrib-1886ab2f1dc1e3b5758a85604998e8deb9198f5e.tar.bz2
openembedded-core-contrib-1886ab2f1dc1e3b5758a85604998e8deb9198f5e.zip
image_types: Use softer setting of WKS_FILE
This will allow for more flexibility and overrides in BSP layers. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 () {
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}"
-WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks"
+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_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"