summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r--scripts/lib/wic/partition.py12
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py2
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py4
3 files changed, 12 insertions, 6 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 90f65a1e39..30bb05a249 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
@@ -375,7 +381,7 @@ class Partition():
375 out = exec_cmd(du_cmd) 381 out = exec_cmd(du_cmd)
376 fs_size = out.split()[0] 382 fs_size = out.split()[0]
377 383
378 self.size = fs_size 384 self.size = int(fs_size)
379 385
380 def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot): 386 def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot):
381 """ 387 """
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 8bc362254d..4adb80becc 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -234,5 +234,5 @@ class BootimgEFIPlugin(SourcePlugin):
234 out = exec_cmd(du_cmd) 234 out = exec_cmd(du_cmd)
235 bootimg_size = out.split()[0] 235 bootimg_size = out.split()[0]
236 236
237 part.size = bootimg_size 237 part.size = int(bootimg_size)
238 part.source_file = bootimg 238 part.source_file = bootimg
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index e0b11f95ad..5bd22fdeb5 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -78,9 +78,9 @@ class RawCopyPlugin(SourcePlugin):
78 # get the size in the right units for kickstart (kB) 78 # get the size in the right units for kickstart (kB)
79 du_cmd = "du -Lbks %s" % dst 79 du_cmd = "du -Lbks %s" % dst
80 out = exec_cmd(du_cmd) 80 out = exec_cmd(du_cmd)
81 filesize = out.split()[0] 81 filesize = int(out.split()[0])
82 82
83 if int(filesize) > int(part.size): 83 if filesize > part.size:
84 part.size = filesize 84 part.size = filesize
85 85
86 part.source_file = dst 86 part.source_file = dst