From 55cf85a27eaa493752dc8089617a2185d8498e44 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Tue, 13 Jun 2017 00:04:21 +0900 Subject: otaimage.py: Arrage script for pyro 1. msger is replaced to logging module in yocto upstream (pyro branch). 2. move oe/misc.py one level up in yocto upstream (pyro branch). Signed-off-by: Changhyeok Bae --- scripts/lib/wic/plugins/source/otaimage.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'scripts/lib/wic/plugins/source/otaimage.py') diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py index dc507a8..eef0bb4 100644 --- a/scripts/lib/wic/plugins/source/otaimage.py +++ b/scripts/lib/wic/plugins/source/otaimage.py @@ -15,11 +15,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +import logging import os +import sys -from wic import msger from wic.pluginbase import SourcePlugin -from wic.utils.oe.misc import get_bitbake_var +from wic.utils.misc import get_bitbake_var class OTAImagePlugin(SourcePlugin): """ @@ -57,12 +58,12 @@ class OTAImagePlugin(SourcePlugin): """ bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") if not bootimg_dir: - msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") + logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") - msger.debug('Bootimg dir: %s' % bootimg_dir) + logger.debug('Bootimg dir: %s' % bootimg_dir) src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg" - msger.debug('Preparing partition using image %s' % (src)) + logger.debug('Preparing partition using image %s' % (src)) part.prepare_rootfs_from_fs_image(cr_workdir, src, "") -- cgit v1.2.3-54-g00ecf