[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3068/8267] image_types: Use softer setting of WKS_FILE

[Emmanuele Bassi <ebassi src gnome org>]

commit 30d1af89ce2a2fb30f32a898ec12c9a51db57013
Author: Saul Wold <sgw linux intel com>
Date:   Fri Oct 14 09:46:19 2016 -0700

    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>

 meta/classes/image_types.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index a7fffbc..1ce8334 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 ''}"