diff options
| author | Saul Wold <sgw@linux.intel.com> | 2016-10-14 09:46:19 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-25 17:58:59 +0100 |
| commit | 30d1af89ce2a2fb30f32a898ec12c9a51db57013 (patch) | |
| tree | 5b08b2b3f7a2f815999dee37e0b3e7154d1d36ca | |
| parent | 69e8c1a8884dbb325d5947a9a079b32fcb61df90 (diff) | |
| download | poky-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>
| -rw-r--r-- | 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 a7fffbce06..1ce8334e3a 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
| @@ -184,7 +184,7 @@ IMAGE_CMD_ubi () { | |||
| 184 | 184 | ||
| 185 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" | 185 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" |
| 186 | 186 | ||
| 187 | WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks" | 187 | WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" |
| 188 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" | 188 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" |
| 189 | WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}" | 189 | WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}" |
| 190 | WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}" | 190 | WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}" |