mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: Remove duplicated code

Browse Source 
Moved duplicated code of geting rootfs size
out of prepare_rootfs* methods.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-06-27 13:37:27 +03:00
committed by Richard Purdie
parent b5dce25ddc
commit 4023377bae
1 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/lib/wic/kickstart/custom_commands/partition.py
View File

@@ -234,8 +234,16 @@ class Wic_PartData(Mic_PartData):
for prefix in ("ext", "btrfs", "vfat", "squashfs"): for prefix in ("ext", "btrfs", "vfat", "squashfs"):
if self.fstype.startswith(prefix): if self.fstype.startswith(prefix):
method = getattr(self, "prepare_rootfs_" + prefix) method = getattr(self, "prepare_rootfs_" + prefix)
return method(rootfs, oe_builddir, rootfs_dir, method(rootfs, oe_builddir, rootfs_dir, native_sysroot, pseudo)
native_sysroot, pseudo)
self.source_file = rootfs
# get the rootfs size in the right units for kickstart (kB)
du_cmd = "du -Lbks %s" % rootfs
out = exec_cmd(du_cmd)
self.size = out.split()[0]
break
def prepare_rootfs_ext(self, rootfs, oe_builddir, rootfs_dir, def prepare_rootfs_ext(self, rootfs, oe_builddir, rootfs_dir,
native_sysroot, pseudo): native_sysroot, pseudo):
@@ -270,16 +278,6 @@ class Wic_PartData(Mic_PartData):
(self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir) (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir)
exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) exec_native_cmd(pseudo + mkfs_cmd, native_sysroot)
# get the rootfs size in the right units for kickstart (kB)
du_cmd = "du -Lbks %s" % rootfs
out = exec_cmd(du_cmd)
rootfs_size = out.split()[0]
self.size = rootfs_size
self.source_file = rootfs
return 0
def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir, def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir,
native_sysroot, pseudo): native_sysroot, pseudo):
""" """
@@ -313,14 +311,6 @@ class Wic_PartData(Mic_PartData):
(self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs) (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs)
exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) exec_native_cmd(pseudo + mkfs_cmd, native_sysroot)
# get the rootfs size in the right units for kickstart (kB)
du_cmd = "du -Lbks %s" % rootfs
out = exec_cmd(du_cmd)
rootfs_size = out.split()[0]
self.size = rootfs_size
self.source_file = rootfs
def prepare_rootfs_vfat(self, rootfs, oe_builddir, rootfs_dir, def prepare_rootfs_vfat(self, rootfs, oe_builddir, rootfs_dir,
native_sysroot, pseudo): native_sysroot, pseudo):
""" """
@@ -360,14 +350,6 @@ class Wic_PartData(Mic_PartData):
chmod_cmd = "chmod 644 %s" % rootfs chmod_cmd = "chmod 644 %s" % rootfs
exec_cmd(chmod_cmd) exec_cmd(chmod_cmd)
# get the rootfs size in the right units for kickstart (kB)
du_cmd = "du -Lbks %s" % rootfs
out = exec_cmd(du_cmd)
rootfs_size = out.split()[0]
self.set_size(rootfs_size)
self.set_source_file(rootfs)
def prepare_rootfs_squashfs(self, rootfs, oe_builddir, rootfs_dir, def prepare_rootfs_squashfs(self, rootfs, oe_builddir, rootfs_dir,
native_sysroot, pseudo): native_sysroot, pseudo):
""" """
@@ -377,16 +359,6 @@ class Wic_PartData(Mic_PartData):
(rootfs_dir, rootfs) (rootfs_dir, rootfs)
exec_native_cmd(pseudo + squashfs_cmd, native_sysroot) exec_native_cmd(pseudo + squashfs_cmd, native_sysroot)
# get the rootfs size in the right units for kickstart (kB)
du_cmd = "du -Lbks %s" % rootfs
out = exec_cmd(du_cmd)
rootfs_size = out.split()[0]
self.size = rootfs_size
self.source_file = rootfs
return 0
def prepare_empty_partition_ext(self, rootfs, oe_builddir, def prepare_empty_partition_ext(self, rootfs, oe_builddir,
native_sysroot): native_sysroot):
""" """