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/partitionedfs.py | |
| parent | 467bf7e68f537b9475241e4cd3450100d0146ab2 (diff) | |
| download | 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/partitionedfs.py')
| -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 43a38a9b14..2f950a69d4 100644 --- a/scripts/lib/mic/utils/partitionedfs.py +++ b/scripts/lib/mic/utils/partitionedfs.py | |||
| @@ -309,11 +309,11 @@ class PartitionedMount: | |||
| 309 | except: | 309 | except: |
| 310 | pass | 310 | pass |
| 311 | 311 | ||
| 312 | def __install_partition(self, num, source_file, start, size): | 312 | def __write_partition(self, num, source_file, start, size): |
| 313 | """ | 313 | """ |
| 314 | Install source_file contents into a partition. | 314 | Install source_file contents into a partition. |
| 315 | """ | 315 | """ |
| 316 | if not source_file: # nothing to install | 316 | if not source_file: # nothing to write |
| 317 | return | 317 | return |
| 318 | 318 | ||
| 319 | # Start is included in the size so need to substract one from the end. | 319 | # Start is included in the size so need to substract one from the end. |
| @@ -325,7 +325,7 @@ class PartitionedMount: | |||
| 325 | exec_cmd(dd_cmd) | 325 | exec_cmd(dd_cmd) |
| 326 | 326 | ||
| 327 | 327 | ||
| 328 | def install(self, image_file): | 328 | def assemble(self, image_file): |
| 329 | msger.debug("Installing partitions") | 329 | msger.debug("Installing partitions") |
| 330 | 330 | ||
| 331 | self.image_file = image_file | 331 | self.image_file = image_file |
| @@ -337,12 +337,12 @@ class PartitionedMount: | |||
| 337 | # of the first _logical_ partition. This is why the extended | 337 | # of the first _logical_ partition. This is why the extended |
| 338 | # partition should start one sector before the first logical | 338 | # partition should start one sector before the first logical |
| 339 | # partition. | 339 | # partition. |
| 340 | self.__install_partition(p['num'], p['source_file'], | 340 | self.__write_partition(p['num'], p['source_file'], |
| 341 | p['start'] - 1, | 341 | p['start'] - 1, |
| 342 | d['offset'] - p['start']) | 342 | d['offset'] - p['start']) |
| 343 | 343 | ||
| 344 | self.__install_partition(p['num'], p['source_file'], | 344 | self.__write_partition(p['num'], p['source_file'], |
| 345 | p['start'], p['size']) | 345 | p['start'], p['size']) |
| 346 | 346 | ||
| 347 | def create(self): | 347 | def create(self): |
| 348 | for dev in self.disks.keys(): | 348 | for dev in self.disks.keys(): |
