[oe-commits] Maciej Borzecki : wic: do not steal sectors from the first partition

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c3251d4191fb0b7c3477a3579e542729598f6aad
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c3251d4191fb0b7c3477a3579e542729598f6aad

Author: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Date:   Tue Aug 19 15:14:17 2014 +0200

wic: do not steal sectors from the first partition

In order to make up for space loss due to overhead located before the
first partition, same amount of bytes was extracted from the first
partition's size. This leads to unexpected change of first partition's
size, and is not matched by similar adjustment at the time the partition
image is generated. Thus it is possible that the first partition may
partially overwrite contents of the following partition, as the
partition image is larger than the allocated space.

This is also problematic on certain platforms such as OMAP, where the
first partition is required for have an even number of
sectors (typically already expressed by --size in kickstart
file). Subtracting an odd number of sectors lost for overhead, leads to
an odd number of sectors assigned for partition, preventing the board,
such as beaglebone, from booting correctly.

Signed-off-by: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/wic/utils/partitionedfs.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 76aa421..36ef406 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -155,9 +155,6 @@ class Image:
 
                 # Skip one sector required for the partitioning scheme overhead
                 d['offset'] += overhead
-                # Steal few sectors from the first partition to offset for the
-                # partitioning overhead
-                p['size'] -= overhead
 
             if p['align']:
                 # If not first partition and we do have alignment set we need