From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
To: <isar-users@googlegroups.com>, <Vijaikumar_Kanagarajan@mentor.com>
Subject: [PATCH v3 2/9] wic/plugins: Fix wic plugins to work with the latest wic
Date: Mon, 7 Sep 2020 21:47:49 +0530 [thread overview]
Message-ID: <20200907161756.16372-3-Vijaikumar_Kanagarajan@mentor.com> (raw)
In-Reply-To: <20200907161756.16372-1-Vijaikumar_Kanagarajan@mentor.com>
In the latest wic, wic.utils is removed and part of the implmentation
is moved to wic.misc. Fix the wic imports accordingly.
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 2 +-
.../lib/wic/plugins/source/bootimg-pcbios-isar.py | 9 +++------
meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
index 25b12ca..2285d2e 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -31,7 +31,7 @@ import shutil
from wic import WicError
from wic.engine import get_custom_config
from wic.pluginbase import SourcePlugin
-from wic.utils.misc import (exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE)
+from wic.misc import (exec_cmd, get_bitbake_var, BOOTDD_EXTRA_SPACE)
logger = logging.getLogger('wic')
diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py
index 0423862..4d916d6 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py
@@ -29,9 +29,8 @@ import os
from wic import WicError
from wic.engine import get_custom_config
-from wic.utils import runner
from wic.pluginbase import SourcePlugin
-from wic.utils.misc import (exec_cmd, exec_native_cmd,
+from wic.misc import (exec_cmd, exec_native_cmd,
get_bitbake_var, BOOTDD_EXTRA_SPACE)
logger = logging.getLogger('wic')
@@ -83,10 +82,8 @@ class BootimgPcbiosIsarPlugin(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/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
index f60afb8..3ac0aa0 100644
--- a/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
+++ b/meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py
@@ -18,7 +18,7 @@ import os
from wic import WicError
from wic.plugins.source.rootfs import RootfsPlugin
-from wic.utils.misc import exec_cmd
+from wic.misc import exec_cmd
logger = logging.getLogger('wic')
--
2.17.1
next prev parent reply other threads:[~2020-09-07 16:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 16:17 [PATCH v3 0/9] WIC update Vijai Kumar K
2020-09-07 16:17 ` [PATCH v3 1/9] wic: Update to the latest wic from openembedded core Vijai Kumar K
2020-09-07 16:17 ` Vijai Kumar K [this message]
2020-09-07 16:17 ` [PATCH v3 3/9] wic-img: Satisfy the quirks of latest wic Vijai Kumar K
2020-09-07 16:20 ` [PATCH v3 4/9] oe.path: Add copyhardlink() helper function Vijai Kumar K
2020-09-07 16:20 ` [PATCH v3 5/9] lib/oe/path: try hardlinking instead of guessing when it might fail Vijai Kumar K
2020-09-07 16:20 ` [PATCH v3 6/9] wic_fakeroot: Handle standalone pseudo invocations Vijai Kumar K
2020-09-07 16:20 ` [PATCH v3 7/9] meta-isar/conf: Add provision to debug WIC Vijai Kumar K
2020-09-07 16:20 ` [PATCH v3 8/9] debian-common: Add tar as a dependency for wic Vijai Kumar K
2020-09-07 16:20 ` [PATCH v3 9/9] meta-isar/canned-wks: Remove unwanted /boot mountpoint Vijai Kumar K
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200907161756.16372-3-Vijaikumar_Kanagarajan@mentor.com \
--to=vijaikumar_kanagarajan@mentor.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox