From f07be1805cc22b5428ff529b705731360b485d06 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 15 Oct 2018 13:55:47 +0200 Subject: image_types_ota: use IMGDEPLOYDIR for ota-ext4 images Do not write directly to the IMAGE_DEPLOY_DIR but to the new deploy directory IMGDEPLOYDIR. Also change the image ending to match the image type name (from otaimg to ota-ext4). This allows to use the automatic symlinking and output artefact management too. Signed-off-by: Stefan Agner --- scripts/lib/wic/plugins/source/otaimage.py | 4 ++-- scripts/qemucommand.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py index ee8088b..4b30776 100644 --- a/scripts/lib/wic/plugins/source/otaimage.py +++ b/scripts/lib/wic/plugins/source/otaimage.py @@ -39,13 +39,13 @@ class OTAImagePlugin(RawCopyPlugin): Called to do the actual content population for a partition i.e. it 'prepares' the partition to be incorporated into the image. """ - bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") + bootimg_dir = get_bitbake_var("IMGDEPLOYDIR") if not bootimg_dir: logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") logger.debug('Bootimg dir: %s' % bootimg_dir) - src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg" + src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".ota-ext4" logger.debug('Preparing partition using image %s' % (src)) source_params['file'] = src diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 86362f7..4abfd4e 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py @@ -6,7 +6,7 @@ from subprocess import check_output, CalledProcessError EXTENSIONS = { 'intel-corei7-64': 'wic', - 'qemux86-64': 'otaimg' + 'qemux86-64': 'ota-ext4' } -- cgit v1.2.3-54-g00ecf