diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-03-26 20:34:27 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-31 12:12:13 +0100 |
| commit | 9749336c37249af99c92478c3e4dc8821cb9a816 (patch) | |
| tree | 6c2b69914e3946ab3618d4ca0da6902d957a36d1 /scripts/lib | |
| parent | 9674bbd0585fc25ccd362f233b83d07ff8f6ff53 (diff) | |
| download | openembedded-core-9749336c37249af99c92478c3e4dc8821cb9a816.tar.gz openembedded-core-9749336c37249af99c92478c3e4dc8821cb9a816.tar.bz2 openembedded-core-9749336c37249af99c92478c3e4dc8821cb9a816.zip | |
wic: remove runner.show API
Replaced runner.show call to exec_cmd call in bootimg-pcbios
plugin. Removed runner.show API as it's not used anywhere else.
[YOCTO #10618]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 6 | ||||
| -rw-r--r-- | scripts/lib/wic/utils/runner.py | 24 |
2 files changed, 2 insertions, 28 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index bfb8ff5a96..5890c1267b 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -81,10 +81,8 @@ class BootimgPcbiosPlugin(SourcePlugin): logger.debug("Installing MBR on disk %s as %s with size %s bytes", disk_name, full_path, disk.min_size) - rcode = runner.show(['dd', 'if=%s' % mbrfile, - 'of=%s' % full_path, 'conv=notrunc']) - if rcode != 0: - raise WicError("Unable to set MBR to %s" % full_path) + dd_cmd = "dd if=%s of=%s conv=notrunc" % (mbrfile, full_path) + exec_cmd(dd_cmd, native_sysroot) @classmethod def do_configure_partition(cls, part, source_params, creator, cr_workdir, diff --git a/scripts/lib/wic/utils/runner.py b/scripts/lib/wic/utils/runner.py index 56d7ea3adf..348557aee8 100644 --- a/scripts/lib/wic/utils/runner.py +++ b/scripts/lib/wic/utils/runner.py @@ -82,30 +82,6 @@ def runtool(cmdln_or_args, catch=1): return (process.returncode, out) -def show(cmdln_or_args): - """Show all messages using logger.debug.""" - - rcode, out = runtool(cmdln_or_args, catch=3) - - if isinstance(cmdln_or_args, list): - cmd = ' '.join(cmdln_or_args) - else: - cmd = cmdln_or_args - - msg = 'running command: "%s"' % cmd - if out: - out = out.strip() - if out: - msg += ', with output::' - msg += '\n +----------------' - for line in out.splitlines(): - msg += '\n | %s' % line - msg += '\n +----------------' - - logger.debug(msg) - - return rcode - def outs(cmdln_or_args, catch=1): # get the outputs of tools return runtool(cmdln_or_args, catch)[1].strip() |