summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/mic/imager/direct.py8
-rw-r--r--scripts/lib/mic/plugins/imager/direct_plugin.py5
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):
54 54
55 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir, 55 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir,
56 kernel_dir, native_sysroot, hdddir, staging_data_dir, 56 kernel_dir, native_sysroot, hdddir, staging_data_dir,
57 creatoropts=None, compress_image=None, 57 creatoropts=None):
58 generate_bmap=None, fstab_entry="uuid"):
59 """ 58 """
60 Initialize a DirectImageCreator instance. 59 Initialize a DirectImageCreator instance.
61 60
@@ -64,19 +63,14 @@ class DirectImageCreator(BaseImageCreator):
64 BaseImageCreator.__init__(self, creatoropts) 63 BaseImageCreator.__init__(self, creatoropts)
65 64
66 self.__instimage = None 65 self.__instimage = None
67 self.__imgdir = None
68 self.__disks = {} 66 self.__disks = {}
69 self.__disk_format = "direct" 67 self.__disk_format = "direct"
70 self._disk_names = [] 68 self._disk_names = []
71 self._ptable_format = self.ks.handler.bootloader.ptable 69 self._ptable_format = self.ks.handler.bootloader.ptable
72 self.use_uuid = fstab_entry == "uuid"
73 self.compress_image = compress_image
74 self.bmap_needed = generate_bmap
75 70
76 self.oe_builddir = oe_builddir 71 self.oe_builddir = oe_builddir
77 if image_output_dir: 72 if image_output_dir:
78 self.tmpdir = image_output_dir 73 self.tmpdir = image_output_dir
79 self.cachedir = "%s/cache" % image_output_dir
80 self.rootfs_dir = rootfs_dir 74 self.rootfs_dir = rootfs_dir
81 self.bootimg_dir = bootimg_dir 75 self.bootimg_dir = bootimg_dir
82 self.kernel_dir = kernel_dir 76 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):
88 native_sysroot, 88 native_sysroot,
89 hdddir, 89 hdddir,
90 staging_data_dir, 90 staging_data_dir,
91 creatoropts, 91 creatoropts)
92 None,
93 None,
94 None)
95 92
96 try: 93 try:
97 creator.mount(None, creatoropts["cachedir"]) 94 creator.mount(None, creatoropts["cachedir"])