summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-05-02 17:06:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:40 +0100
commitaf4e3198618f98f76b1d90fc96ed87b90c4c444e (patch)
treea4640d9e106d518fd03120f9aadcba9ed6f9ee0e /meta/classes
parent5ae5fc7e7b632717be02d1db2fbb9a7cf6ba4f12 (diff)
downloadpoky-af4e3198618f98f76b1d90fc96ed87b90c4c444e.tar.gz
image_types.bbclass: add WIC_CREATE_EXTRA_ARGS
This'll be of use to pass things like --bmap. (From OE-Core rev: 90b2738fb07e329cb6b867fb37a929d562f27d15) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image_types.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 53af7ca8dc..0b9758e42b 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -193,6 +193,8 @@ def wks_search(files, search_path):
193 if searched: 193 if searched:
194 return searched 194 return searched
195 195
196WIC_CREATE_EXTRA_ARGS ?= ""
197
196IMAGE_CMD_wic () { 198IMAGE_CMD_wic () {
197 out="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}" 199 out="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}"
198 wks="${WKS_FULL_PATH}" 200 wks="${WKS_FULL_PATH}"
@@ -200,7 +202,7 @@ IMAGE_CMD_wic () {
200 bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." 202 bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
201 fi 203 fi
202 204
203 BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" 205 BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS}
204 mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" 206 mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
205 rm -rf "$out/" 207 rm -rf "$out/"
206} 208}