Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [wic][PATCH 13/20] wic: Remove duplicated code
Date: Mon, 29 Jun 2015 22:10:26 +0300	[thread overview]
Message-ID: <1435605033-11509-14-git-send-email-ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <1435605033-11509-1-git-send-email-ed.bartosh@linux.intel.com>

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

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>

diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 4e8a6a8..72f617a 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -234,8 +234,16 @@ class Wic_PartData(Mic_PartData):
         for prefix in ("ext", "btrfs", "vfat", "squashfs"):
             if self.fstype.startswith(prefix):
                 method = getattr(self, "prepare_rootfs_" + prefix)
-                return method(rootfs, oe_builddir, rootfs_dir,
-                              native_sysroot, pseudo)
+                method(rootfs, oe_builddir, rootfs_dir, 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,
                            native_sysroot, pseudo):
@@ -270,16 +278,6 @@ class Wic_PartData(Mic_PartData):
             (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir)
         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,
                              native_sysroot, pseudo):
         """
@@ -313,14 +311,6 @@ class Wic_PartData(Mic_PartData):
             (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs)
         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,
                             native_sysroot, pseudo):
         """
@@ -360,14 +350,6 @@ class Wic_PartData(Mic_PartData):
         chmod_cmd = "chmod 644 %s" % rootfs
         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,
                                 native_sysroot, pseudo):
         """
@@ -377,16 +359,6 @@ class Wic_PartData(Mic_PartData):
                        (rootfs_dir, rootfs)
         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,
                                     native_sysroot):
         """
-- 
2.1.4



  parent reply	other threads:[~2015-06-29 19:11 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-29 19:10 [wic][PATCH 00/20] miscellaneous fixes. poky-conrib:ed/wic/misc Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 01/20] wic: Fix misleading message Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 02/20] wic: Test rootfs plugin using image recipes Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 03/20] wic: Test rootfs plugin using rootfs paths Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 04/20] wic: Refactor getting bitbake variables Ed Bartosh
2015-06-29 21:48   ` Christopher Larson
2015-06-30  8:11     ` Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 05/20] wic: Include mount point into image report Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 06/20] wic: Remove annoing debug message Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 07/20] wic: Turn off debug output for 'bitbake -e' Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 08/20] wic: Refactor prepare_rootfs API Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 09/20] wic: Rename partition images Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 10/20] wic: Get rid of useless variable 'image_rootfs' Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 11/20] wic: Call methods better way Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 12/20] wic: Refactor prepare_empty_partition API Ed Bartosh
2015-06-29 19:10 ` Ed Bartosh [this message]
2015-06-29 19:10 ` [wic][PATCH 14/20] wic: Fix naming conflict Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 15/20] wic: Add --uuid partition option Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 16/20] wic: Refactor fstab update code Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 17/20] wic: Remove __write_partition method Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 18/20] wic: Fix confusing error message Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 19/20] wic: Code cleanup: long lines, identation and whitespaces Ed Bartosh
2015-06-29 19:10 ` [wic][PATCH 20/20] wic: Code cleanup: unused imports Ed Bartosh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435605033-11509-14-git-send-email-ed.bartosh@linux.intel.com \
    --to=ed.bartosh@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox