diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-05 08:58:27 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:52:17 +0100 |
| commit | dbbe6d04f6c606c94ff17151aee1214e4e24ce7d (patch) | |
| tree | 4b6b86e722777584194f879c377d5cfcc218ee82 | |
| parent | 6bd95c24b44fa80ac9d5950bf2d925f18f671290 (diff) | |
| download | openembedded-core-dbbe6d04f6c606c94ff17151aee1214e4e24ce7d.tar.gz openembedded-core-dbbe6d04f6c606c94ff17151aee1214e4e24ce7d.tar.bz2 openembedded-core-dbbe6d04f6c606c94ff17151aee1214e4e24ce7d.zip | |
wic: Clean up DirectImageCreator
Remove what wic doesn't use from DirectImageCreator.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
| -rw-r--r-- | scripts/lib/mic/imager/direct.py | 8 | ||||
| -rw-r--r-- | scripts/lib/mic/plugins/imager/direct_plugin.py | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index 93f0cd9e6c..92473b5bb7 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py @@ -54,8 +54,7 @@ class DirectImageCreator(BaseImageCreator): def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot, hdddir, staging_data_dir, - creatoropts=None, compress_image=None, - generate_bmap=None, fstab_entry="uuid"): + creatoropts=None): """ Initialize a DirectImageCreator instance. @@ -64,19 +63,14 @@ class DirectImageCreator(BaseImageCreator): BaseImageCreator.__init__(self, creatoropts) self.__instimage = None - self.__imgdir = None self.__disks = {} self.__disk_format = "direct" self._disk_names = [] self._ptable_format = self.ks.handler.bootloader.ptable - self.use_uuid = fstab_entry == "uuid" - self.compress_image = compress_image - self.bmap_needed = generate_bmap self.oe_builddir = oe_builddir if image_output_dir: self.tmpdir = image_output_dir - self.cachedir = "%s/cache" % image_output_dir self.rootfs_dir = rootfs_dir self.bootimg_dir = bootimg_dir self.kernel_dir = kernel_dir diff --git a/scripts/lib/mic/plugins/imager/direct_plugin.py b/scripts/lib/mic/plugins/imager/direct_plugin.py index d3a0ba75d3..877aaf6105 100644 --- a/scripts/lib/mic/plugins/imager/direct_plugin.py +++ b/scripts/lib/mic/plugins/imager/direct_plugin.py @@ -88,10 +88,7 @@ class DirectPlugin(ImagerPlugin): native_sysroot, hdddir, staging_data_dir, - creatoropts, - None, - None, - None) + creatoropts) try: creator.mount(None, creatoropts["cachedir"]) |