mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

wic: Remove __write_partition method

Browse Source 
Moved code of __write_partition to 'assemble' method.
This way it should be more readable.

(From OE-Core rev: f7059362053c87f96ce68d1ab850962defb76540)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-06-29 11:19:38 +03:00
committed by Richard Purdie
parent 0ef9cdd1ec
commit d88af4f518
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/wic/utils/partitionedfs.py
+15 -21
View File
@@ -334,30 +334,24 @@ class Image(object):
except:
pass
def __write_partition(self, num, source_file, start, size, image_file):
"""
Install source_file contents into a partition.
"""
if not source_file: # nothing to write
return
# Start is included in the size so need to substract one from the end.
end = start + size - 1
msger.debug("Installed %s in partition %d, sectors %d-%d, "
"size %d sectors" % (source_file, num, start, end, size))
dd_cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc" % \
(source_file, image_file, self.sector_size, start, size)
exec_cmd(dd_cmd)
def assemble(self, image_file):
msger.debug("Installing partitions")
for p in self.partitions:
self.__write_partition(p['num'], p['source_file'],
p['start'], p['size'], image_file)
os.rename(p['source_file'], image_file + '.p%d' % p['num'])
for part in self.partitions:
source = part['source_file']
if source:
# install source_file contents into a partition
cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc" % \
(source, image_file, self.sector_size,
part['start'], part['size'])
exec_cmd(cmd)
msger.debug("Installed %s in partition %d, sectors %d-%d, "
"size %d sectors" % \
(source, part['num'], part['start'],
part['start'] + part['size'] - 1, part['size']))
os.rename(source, image_file + '.p%d' % part['num'])
def create(self):
for dev in self.disks.keys():