wic: direct: move generation of part.realnum to PartitionedImage
Moved the code that generates real partition numbers from DirectPlugin to PartitionedImage. The idea is to have all code that works with partitions in PartitionedImage class. (From OE-Core rev: dbd58b0b32288821d9dd5d1a3118cf7c6e8f098a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
32e2d92913
commit
924e84ea8d
|
@ -74,19 +74,6 @@ class DirectPlugin(ImagerPlugin):
|
|||
self.ptable_format = self.ks.bootloader.ptable
|
||||
self.parts = self.ks.partitions
|
||||
|
||||
# calculate the real partition number, accounting for partitions not
|
||||
# in the partition table and logical partitions
|
||||
realnum = 0
|
||||
for part in self.parts:
|
||||
if part.no_table:
|
||||
part.realnum = 0
|
||||
else:
|
||||
realnum += 1
|
||||
if self.ptable_format == 'msdos' and realnum > 3:
|
||||
part.realnum = realnum + 1
|
||||
continue
|
||||
part.realnum = realnum
|
||||
|
||||
# as a convenience, set source to the boot partition source
|
||||
# instead of forcing it to be set via bootloader --source
|
||||
for part in self.parts:
|
||||
|
@ -317,6 +304,19 @@ class PartitionedImage():
|
|||
self.sector_size = SECTOR_SIZE
|
||||
self.native_sysroot = native_sysroot
|
||||
|
||||
# calculate the real partition number, accounting for partitions not
|
||||
# in the partition table and logical partitions
|
||||
realnum = 0
|
||||
for part in self.partitions:
|
||||
if part.no_table:
|
||||
part.realnum = 0
|
||||
else:
|
||||
realnum += 1
|
||||
if self.ptable_format == 'msdos' and realnum > 3:
|
||||
part.realnum = realnum + 1
|
||||
continue
|
||||
part.realnum = realnum
|
||||
|
||||
# generate parition UUIDs
|
||||
for part in self.partitions:
|
||||
if not part.uuid and part.use_uuid:
|
||||
|
|
Loading…
Reference in New Issue