From: Saul Wold <sgw@linux.intel.com>
Date: Fri, 14 Oct 2016 16:46:19 +0000 (-0700)
Subject: image_types: Use softer setting of WKS_FILE
X-Git-Tag: 2016-10~4
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1886ab2f1dc1e3b5758a85604998e8deb9198f5e;p=openembedded-core.git

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>
---

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 ''}"