diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image_types.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 2 |
3 files changed, 3 insertions, 3 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 () { if not wicvars: return - stdir = d.getVar('STAGING_DIR_TARGET') + stdir = d.getVar('STAGING_DIR') outdir = os.path.join(stdir, 'imgdata') bb.utils.mkdirhier(outdir) 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 () { bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." fi - BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} + BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" rm -rf "$out/" } diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 77f1bdcfa9..6a61ba6868 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -332,7 +332,7 @@ class Wic(oeSelfTest): """Generate and obtain the path to <image>.env""" if image not in self.wicenv_cache: self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status) - stdir = get_bb_var('STAGING_DIR_TARGET', image) + stdir = get_bb_var('STAGING_DIR', image) self.wicenv_cache[image] = os.path.join(stdir, 'imgdata') return self.wicenv_cache[image] |