[oe-commits] [openembedded-core] branch master updated: image_types: Use softer setting of WKS_FILE

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

The following commit(s) were added to refs/heads/master by this push:
       new  1886ab2   image_types: Use softer setting of WKS_FILE
1886ab2 is described below

commit 1886ab2f1dc1e3b5758a85604998e8deb9198f5e
Author: Saul Wold <sgw at linux.intel.com>
AuthorDate: 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.
    
    Signed-off-by: Saul Wold <sgw at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.