summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/partition.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-03-30 21:17:20 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-01 08:14:58 +0100
commit67ec097bc3d1734dc5a1c7162a7c99b57d45afe8 (patch)
treee1e6c39cfaf6548dae9f480333c9065619ccab78 /scripts/lib/wic/partition.py
parent5efb8e039bf89858e81d75a4bde033efc3350a67 (diff)
downloadpoky-67ec097bc3d1734dc5a1c7162a7c99b57d45afe8.tar.gz
wic: remove prepare_empty_partition_squashfs
There is not much sense in creation of empty squashfs partition. It's also not possible to create empty squashfs partition of specified size. Even more, prepare_empty_partition_squashfs method is absolutely broken. It raises exception when called and even its signature differs from the rest of of similar methods. It means that nobody uses it and it's safe to remove it. Removed prepare_empty_partition_squashfs method and testing of empty squashfs partition. (From OE-Core rev: 9152960f250cb4df1e559d747fb09005675a0d75) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/partition.py')
-rw-r--r--scripts/lib/wic/partition.py33
1 files changed, 4 insertions, 29 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 6f324ad5b3..5edb340c3a 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -141,6 +141,10 @@ class Partition():
141 native_sysroot) 141 native_sysroot)
142 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype) 142 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
143 else: 143 else:
144 if self.fstype == 'squashfs':
145 raise WicError("It's not possible to create empty squashfs "
146 "partition '%s'" % (self.mountpoint))
147
144 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, 148 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
145 self.lineno, self.fstype) 149 self.lineno, self.fstype)
146 if os.path.isfile(rootfs): 150 if os.path.isfile(rootfs):
@@ -390,35 +394,6 @@ class Partition():
390 394
391 prepare_empty_partition_vfat = prepare_empty_partition_msdos 395 prepare_empty_partition_vfat = prepare_empty_partition_msdos
392 396
393 def prepare_empty_partition_squashfs(self, cr_workdir, oe_builddir,
394 native_sysroot):
395 """
396 Prepare an empty squashfs partition.
397 """
398 logger.warning("Creating of an empty squashfs %s partition was attempted. "
399 "Proceeding as requested.", self.mountpoint)
400
401 path = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
402 if os.path.isfile(path):
403 os.remove(path)
404
405 # it is not possible to create a squashfs without source data,
406 # thus prepare an empty temp dir that is used as source
407 tmpdir = tempfile.mkdtemp()
408
409 squashfs_cmd = "mksquashfs %s %s -noappend" % \
410 (tmpdir, path)
411 exec_native_cmd(squashfs_cmd, native_sysroot)
412
413 os.rmdir(tmpdir)
414
415 # get the rootfs size in the right units for kickstart (kB)
416 du_cmd = "du -Lbks %s" % path
417 out = exec_cmd(du_cmd)
418 fs_size = out.split()[0]
419
420 self.size = int(fs_size)
421
422 def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot): 397 def prepare_swap_partition(self, cr_workdir, oe_builddir, native_sysroot):
423 """ 398 """
424 Prepare a swap partition. 399 Prepare a swap partition.