diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-08 13:28:54 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:12 +0100 |
commit | d02c91fe4db69fa780d7d1924105446208a66819 (patch) | |
tree | 41265108e778de4eb099534a1d544fd525360fe8 /scripts/lib/mic/utils | |
parent | 467bf7e68f537b9475241e4cd3450100d0146ab2 (diff) | |
download | ast2050-yocto-poky-d02c91fe4db69fa780d7d1924105446208a66819.zip ast2050-yocto-poky-d02c91fe4db69fa780d7d1924105446208a66819.tar.gz |
wic: Update/rename install-related code
The wic code inherited a basic image-creation flow based on installing
packages, but wic doesn't actually install anything, so rename parts
of the code dealing with installing to something more appropriate.
(From OE-Core rev: b4232041534a79236eb8d8ab5c0024a0ef4da649)
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/partitionedfs.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/mic/utils/partitionedfs.py index 43a38a9..2f950a6 100644 --- a/scripts/lib/mic/utils/partitionedfs.py +++ b/scripts/lib/mic/utils/partitionedfs.py @@ -309,11 +309,11 @@ class PartitionedMount: except: pass - def __install_partition(self, num, source_file, start, size): + def __write_partition(self, num, source_file, start, size): """ Install source_file contents into a partition. """ - if not source_file: # nothing to install + if not source_file: # nothing to write return # Start is included in the size so need to substract one from the end. @@ -325,7 +325,7 @@ class PartitionedMount: exec_cmd(dd_cmd) - def install(self, image_file): + def assemble(self, image_file): msger.debug("Installing partitions") self.image_file = image_file @@ -337,12 +337,12 @@ class PartitionedMount: # of the first _logical_ partition. This is why the extended # partition should start one sector before the first logical # partition. - self.__install_partition(p['num'], p['source_file'], - p['start'] - 1, - d['offset'] - p['start']) + self.__write_partition(p['num'], p['source_file'], + p['start'] - 1, + d['offset'] - p['start']) - self.__install_partition(p['num'], p['source_file'], - p['start'], p['size']) + self.__write_partition(p['num'], p['source_file'], + p['start'], p['size']) def create(self): for dev in self.disks.keys(): |