[OE-core] [PATCH 6/9] wic: make sure layout_partitions is called once
Ed Bartosh
ed.bartosh at linux.intel.com
Wed Feb 8 18:51:30 UTC 2017
Removed artificial _partitions_layed_out attribute and
unneeded call of layout_partitions method.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
scripts/lib/wic/utils/partitionedfs.py | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index fb5c0c2..5397bb7 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" % \
--
2.1.4
More information about the Openembedded-core
mailing list