diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 3d60e6f0ff..1032019a5f 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |||
@@ -22,7 +22,7 @@ import os | |||
22 | from wic import msger | 22 | from wic import msger |
23 | from wic.utils import syslinux | 23 | from wic.utils import syslinux |
24 | from wic.utils import runner | 24 | from wic.utils import runner |
25 | from wic.utils.oe import misc | 25 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd |
26 | from wic.utils.errors import ImageError | 26 | from wic.utils.errors import ImageError |
27 | from wic.pluginbase import SourcePlugin | 27 | from wic.pluginbase import SourcePlugin |
28 | 28 | ||
@@ -58,7 +58,7 @@ class RootfsPlugin(SourcePlugin): | |||
58 | if os.path.isdir(rootfs_dir): | 58 | if os.path.isdir(rootfs_dir): |
59 | return rootfs_dir | 59 | return rootfs_dir |
60 | 60 | ||
61 | image_rootfs_dir = misc.get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) | 61 | image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) |
62 | if not os.path.isdir(image_rootfs_dir): | 62 | if not os.path.isdir(image_rootfs_dir): |
63 | msg = "No valid artifact IMAGE_ROOTFS from image named" | 63 | msg = "No valid artifact IMAGE_ROOTFS from image named" |
64 | msg += " %s has been found at %s, exiting.\n" % \ | 64 | msg += " %s has been found at %s, exiting.\n" % \ |
@@ -119,7 +119,7 @@ class RootfsPlugin(SourcePlugin): | |||
119 | native_syslinux_nomtools = os.path.join(native_sysroot, "usr/bin/syslinux-nomtools") | 119 | native_syslinux_nomtools = os.path.join(native_sysroot, "usr/bin/syslinux-nomtools") |
120 | if not is_exe(native_syslinux_nomtools): | 120 | if not is_exe(native_syslinux_nomtools): |
121 | msger.info("building syslinux-native...") | 121 | msger.info("building syslinux-native...") |
122 | misc.exec_cmd("bitbake syslinux-native") | 122 | exec_cmd("bitbake syslinux-native") |
123 | if not is_exe(native_syslinux_nomtools): | 123 | if not is_exe(native_syslinux_nomtools): |
124 | msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" % | 124 | msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" % |
125 | native_syslinux_nomtools) | 125 | native_syslinux_nomtools) |
@@ -145,7 +145,7 @@ class RootfsPlugin(SourcePlugin): | |||
145 | 145 | ||
146 | # install syslinux into rootfs partition | 146 | # install syslinux into rootfs partition |
147 | syslinux_cmd = "syslinux-nomtools -d /boot -i %s" % part.source_file | 147 | syslinux_cmd = "syslinux-nomtools -d /boot -i %s" % part.source_file |
148 | misc.exec_native_cmd(syslinux_cmd, native_sysroot) | 148 | exec_native_cmd(syslinux_cmd, native_sysroot) |
149 | 149 | ||
150 | @classmethod | 150 | @classmethod |
151 | def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir, | 151 | def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir, |