summaryrefslogtreecommitdiffstats
path: root/scripts/lib/mic/utils
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-08-08 07:53:35 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 10:53:11 +0100
commitbd0dd4489e15700333185a6afc6ea53a397246fb (patch)
tree0a8ee29022531c2dfd4871fd2fda3db66ee64d53 /scripts/lib/mic/utils
parentd74e7d3fa693eb7037a57dfbd0c47bc53255316f (diff)
downloadpoky-bd0dd4489e15700333185a6afc6ea53a397246fb.tar.gz
wic: Remove Mount object
It doesn't do anything we need, so remove it and fix up callers/base classes. (From OE-Core rev: fb2a162d8756ab69c9c29a0715b033f18620341d) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/utils')
-rw-r--r--scripts/lib/mic/utils/fs_related.py16
-rw-r--r--scripts/lib/mic/utils/partitionedfs.py4
2 files changed, 1 insertions, 19 deletions
diff --git a/scripts/lib/mic/utils/fs_related.py b/scripts/lib/mic/utils/fs_related.py
index e6e362d0ba..07a5ff995d 100644
--- a/scripts/lib/mic/utils/fs_related.py
+++ b/scripts/lib/mic/utils/fs_related.py
@@ -112,19 +112,3 @@ class DiskImage(Disk):
112 exec_cmd(dd_cmd) 112 exec_cmd(dd_cmd)
113 113
114 self.device = self.image_file 114 self.device = self.image_file
115
116
117class Mount:
118 """A generic base class to deal with mounting things."""
119 def __init__(self, mountdir):
120 self.mountdir = mountdir
121
122 def cleanup(self):
123 self.unmount()
124
125 def mount(self, options = None):
126 pass
127
128 def unmount(self):
129 pass
130
diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/mic/utils/partitionedfs.py
index ef92125c98..50536b4fce 100644
--- a/scripts/lib/mic/utils/partitionedfs.py
+++ b/scripts/lib/mic/utils/partitionedfs.py
@@ -32,9 +32,8 @@ MBR_OVERHEAD = 1
32# Size of a sector in bytes 32# Size of a sector in bytes
33SECTOR_SIZE = 512 33SECTOR_SIZE = 512
34 34
35class PartitionedMount(Mount): 35class PartitionedMount:
36 def __init__(self, mountdir): 36 def __init__(self, mountdir):
37 Mount.__init__(self, mountdir)
38 self.disks = {} 37 self.disks = {}
39 self.partitions = [] 38 self.partitions = []
40 self.mountOrder = [] 39 self.mountOrder = []
@@ -316,7 +315,6 @@ class PartitionedMount(Mount):
316 self.unmountOrder.reverse() 315 self.unmountOrder.reverse()
317 316
318 def cleanup(self): 317 def cleanup(self):
319 Mount.cleanup(self)
320 if self.disks: 318 if self.disks:
321 for dev in self.disks.keys(): 319 for dev in self.disks.keys():
322 d = self.disks[dev] 320 d = self.disks[dev]