mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 11:28:58 +00:00
wic: do not realign aligned partitions
The change prevents additional realignment of already aligned partition. Previously, even already aligned partitions would be pushed forward by the amount of --align. (From OE-Core rev: 92a1b83d928173a58280ca019ca81fdeb5ba72b5) Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5686b2d5a7
commit
50fbf19a93
@@ -164,16 +164,19 @@ class Image:
|
||||
|
||||
# Calc how much the alignment is off.
|
||||
align_sectors = d['offset'] % (p['align'] * 1024 / self.sector_size)
|
||||
# We need to move forward to the next alignment point
|
||||
align_sectors = (p['align'] * 1024 / self.sector_size) - align_sectors
|
||||
|
||||
msger.debug("Realignment for %s%s with %s sectors, original"
|
||||
" offset %s, target alignment is %sK." %
|
||||
(p['disk_name'], d['numpart'], align_sectors,
|
||||
d['offset'], p['align']))
|
||||
if align_sectors:
|
||||
# If partition is not aligned as required, we need
|
||||
# to move forward to the next alignment point
|
||||
align_sectors = (p['align'] * 1024 / self.sector_size) - align_sectors
|
||||
|
||||
# increase the offset so we actually start the partition on right alignment
|
||||
d['offset'] += align_sectors
|
||||
msger.debug("Realignment for %s%s with %s sectors, original"
|
||||
" offset %s, target alignment is %sK." %
|
||||
(p['disk_name'], d['numpart'], align_sectors,
|
||||
d['offset'], p['align']))
|
||||
|
||||
# increase the offset so we actually start the partition on right alignment
|
||||
d['offset'] += align_sectors
|
||||
|
||||
p['start'] = d['offset']
|
||||
d['offset'] += p['size']
|
||||
|
||||
Reference in New Issue
Block a user