diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-08 20:51:30 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 20:06:33 -0800 |
| commit | 702772edc839c220140ac0572bb14b4e44c81c1c (patch) | |
| tree | 4f4bef87f00fc3f14c199d776959a7be4f5445ab /scripts/lib/wic/utils | |
| parent | 97db24d34847a641868f9ee83aae56f9dd5e0a8a (diff) | |
| download | openembedded-core-702772edc839c220140ac0572bb14b4e44c81c1c.tar.gz openembedded-core-702772edc839c220140ac0572bb14b4e44c81c1c.tar.bz2 openembedded-core-702772edc839c220140ac0572bb14b4e44c81c1c.zip | |
wic: make sure layout_partitions is called once
Removed artificial _partitions_layed_out attribute and
unneeded call of layout_partitions method.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/wic/utils')
| -rw-r--r-- | scripts/lib/wic/utils/partitionedfs.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index fb5c0c2f0a..5397bb704c 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -46,7 +46,6 @@ class Image(): self.partimages = [] # Size of a sector used in calculations self.sector_size = SECTOR_SIZE - self._partitions_layed_out = False self.native_sysroot = native_sysroot def _add_disk(self, disk_name): @@ -58,8 +57,6 @@ class Image(): # We already have this disk return - assert not self._partitions_layed_out - self.disks[disk_name] = \ {'disk': None, # Disk object 'numpart': 0, # Number of allocate partitions @@ -90,8 +87,6 @@ class Image(): # Converting kB to sectors for parted part.size_sec = part.disk_size * 1024 // self.sector_size - assert not self._partitions_layed_out - self.partitions.append(part) self._add_disk(part.disk) @@ -102,11 +97,6 @@ class Image(): msger.debug("Assigning %s partitions to disks" % ptable_format) - if self._partitions_layed_out: - return - - self._partitions_layed_out = True - # Go through partitions in the order they are added in .ks file for num in range(len(self.partitions)): part = self.partitions[num] @@ -219,8 +209,6 @@ class Image(): disk = self.disks[dev] disk['disk'].create() - self.layout_partitions() - for dev in self.disks: disk = self.disks[dev] msger.debug("Initializing partition table for %s" % \ |