diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image_types.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 5fc7385d79..fb0cce35c5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -342,7 +342,7 @@ python do_rootfs_wicenv () { | |||
342 | if not wicvars: | 342 | if not wicvars: |
343 | return | 343 | return |
344 | 344 | ||
345 | stdir = d.getVar('STAGING_DIR_TARGET') | 345 | stdir = d.getVar('STAGING_DIR') |
346 | outdir = os.path.join(stdir, 'imgdata') | 346 | outdir = os.path.join(stdir, 'imgdata') |
347 | bb.utils.mkdirhier(outdir) | 347 | bb.utils.mkdirhier(outdir) |
348 | basename = d.getVar('IMAGE_BASENAME') | 348 | basename = d.getVar('IMAGE_BASENAME') |
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index bac7ff5d37..5b1746a68c 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -216,7 +216,7 @@ IMAGE_CMD_wic () { | |||
216 | bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." | 216 | bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." |
217 | fi | 217 | fi |
218 | 218 | ||
219 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} | 219 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} |
220 | mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" | 220 | mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" |
221 | rm -rf "$out/" | 221 | rm -rf "$out/" |
222 | } | 222 | } |