From 4e9952514211ef4b9a3731ce915090385f335a31 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 24 Jan 2017 15:43:50 +0200 Subject: wic: get rid of baseimager inheritance Simplified DirectImageCreator code by removing inheritance from BaseImageCreator. This inheritance doesn't make much sense as DirectImageCreator is the only class that was inherited from BaseImageCreator. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/imager/direct.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'scripts/lib/wic/imager/direct.py') diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 52828c10cd..825c9d7f6e 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -32,7 +32,6 @@ from wic import msger from wic.utils.oe.misc import get_bitbake_var from wic.utils.partitionedfs import Image from wic.utils.errors import CreatorError, ImageError -from wic.imager.baseimager import BaseImageCreator from wic.plugin import pluginmgr from wic.utils.oe.misc import exec_cmd, exec_native_cmd @@ -61,7 +60,7 @@ class DiskImage(): self.created = True -class DirectImageCreator(BaseImageCreator): +class DirectImageCreator: """ Installs a system into a file containing a partitioned disk image. @@ -72,15 +71,23 @@ class DirectImageCreator(BaseImageCreator): media and used on actual hardware. """ - def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir, - kernel_dir, native_sysroot, compressor, creatoropts=None, - bmap=False): + def __init__(self, oe_builddir, image_output_dir, rootfs_dir, + bootimg_dir, kernel_dir, native_sysroot, compressor, + creatoropts, bmap=False): """ Initialize a DirectImageCreator instance. This method takes the same arguments as ImageCreator.__init__() """ - BaseImageCreator.__init__(self, creatoropts) + + self.name = creatoropts['name'] + self.ks = creatoropts['ks'] + + self.tmpdir = "/var/tmp/wic" + self.workdir = "/var/tmp/wic/build" + + if not os.path.exists(self.tmpdir): + os.makedirs(self.tmpdir) self.__image = None self.__disks = {} -- cgit v1.2.3