summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/partition.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic/partition.py')
-rw-r--r--scripts/lib/wic/partition.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 89c33ab8b7..959035a971 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -146,6 +146,12 @@ class Partition():
146 oe_builddir, 146 oe_builddir,
147 bootimg_dir, kernel_dir, rootfs_dir, 147 bootimg_dir, kernel_dir, rootfs_dir,
148 native_sysroot) 148 native_sysroot)
149 # further processing required Partition.size to be an integer, make
150 # sure that it is one
151 if type(self.size) is not int:
152 msger.error("Partition %s internal size is not an integer. " \
153 "This a bug in source plugin %s and needs to be fixed." \
154 % (self.mountpoint, self.source))
149 155
150 def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir, 156 def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir,
151 rootfs_dir): 157 rootfs_dir):
@@ -157,7 +163,7 @@ class Partition():
157 out = exec_cmd(du_cmd) 163 out = exec_cmd(du_cmd)
158 rootfs_size = out.split()[0] 164 rootfs_size = out.split()[0]
159 165
160 self.size = rootfs_size 166 self.size = int(rootfs_size)
161 self.source_file = rootfs 167 self.source_file = rootfs
162 168
163 def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir, 169 def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir,
@@ -194,7 +200,7 @@ class Partition():
194 # get the rootfs size in the right units for kickstart (kB) 200 # get the rootfs size in the right units for kickstart (kB)
195 du_cmd = "du -Lbks %s" % rootfs 201 du_cmd = "du -Lbks %s" % rootfs
196 out = exec_cmd(du_cmd) 202 out = exec_cmd(du_cmd)
197 self.size = out.split()[0] 203 self.size = int(out.split()[0])
198 204
199 break 205 break
200 206
@@ -379,7 +385,7 @@ class Partition():
379 out = exec_cmd(du_cmd) 385 out = exec_cmd(du_cmd)
380 fs_size = out.split()[0] 386 fs_size = out.split()[0]
381 387
382 self.size = fs_size 388 self.size = int(fs_size)
383 389
384 def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot): 390 def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot):
385 """ 391 """