wic: add --sector-size cmdline arg to create

Add a command-line argument, --sector-size <N>, to wic's "create" subcommand
and allow it to propagate throughout the wic code so it can be used when
generating a wic image.

Signed-off-by: Trevor Woerner <trevor.woerner@amd.com>

Added scripts/lib/scriptpath.py change.

Updated the wic version to make it clear it's from this layer.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

5 files changed, 29 insertions, 16 deletions

diff --git a/meta-xilinx-core/scripts/lib/scriptpath.py b/meta-xilinx-core/scripts/lib/scriptpath.py
index f32326db..7df06018 100644
--- a/meta-xilinx-core/scripts/lib/scriptpath.py
+++ b/meta-xilinx-core/scripts/lib/scriptpath.py
@@ -12,7 +12,7 @@ import os.path
 
 def add_oe_lib_path():
     basepath = os.path.abspath(os.path.dirname(__file__) + '/../..')
-    newpath = basepath + '/meta/lib'
+    newpath = basepath + '/lib'
     sys.path.insert(0, newpath)
 
 def add_bitbake_lib_path():
diff --git a/meta-xilinx-core/scripts/lib/wic/ksparser.py b/meta-xilinx-core/scripts/lib/wic/ksparser.py
index 7ef3dc83..98a98fa5 100644
--- a/meta-xilinx-core/scripts/lib/wic/ksparser.py
+++ b/meta-xilinx-core/scripts/lib/wic/ksparser.py
@@ -135,12 +135,13 @@ class KickStart():
     DEFAULT_EXTRA_SPACE = 10*1024
     DEFAULT_OVERHEAD_FACTOR = 1.3
 
-    def __init__(self, confpath):
+    def __init__(self, confpath, cmdline_args):
 
         self.partitions = []
         self.bootloader = None
         self.lineno = 0
         self.partnum = 0
+        self.cmdline_args = cmdline_args
 
         parser = KickStartParser()
         subparsers = parser.add_subparsers()
@@ -281,7 +282,7 @@ class KickStart():
                                 parsed.extra_space = self.DEFAULT_EXTRA_SPACE
 
                         self.partnum += 1
-                        self.partitions.append(Partition(parsed, self.partnum))
+                        self.partitions.append(Partition(parsed, self.partnum, self.cmdline_args))
                     elif line.startswith('include'):
                         self._parse(parser, parsed.path)
                     elif line.startswith('bootloader'):
diff --git a/meta-xilinx-core/scripts/lib/wic/partition.py b/meta-xilinx-core/scripts/lib/wic/partition.py
index bf2c34d5..4dc5adfa 100644
--- a/meta-xilinx-core/scripts/lib/wic/partition.py
+++ b/meta-xilinx-core/scripts/lib/wic/partition.py
@@ -22,7 +22,7 @@ logger = logging.getLogger('wic')
 
 class Partition():
 
-    def __init__(self, args, lineno):
+    def __init__(self, args, lineno, cmdline_args):
         self.args = args
         self.active = args.active
         self.align = args.align
@@ -61,6 +61,7 @@ class Partition():
         self.update_fstab_in_rootfs = False
         self.hidden = args.hidden
         self.mbr = args.mbr
+        self.sector_size = cmdline_args.sector_size
 
         self.lineno = lineno
         self.source_file = ""
@@ -283,6 +284,8 @@ class Partition():
             os.ftruncate(sparse.fileno(), rootfs_size * 1024)
 
         extraopts = self.mkfs_extraopts or "-F -i 8192"
+        if self.sector_size != 512:
+            extraopts += " -b %d" % self.sector_size
 
         # use hash_seed to generate reproducible ext4 images
         (extraopts, pseudo) = self.get_hash_seed_ext4(extraopts, pseudo)
@@ -293,6 +296,7 @@ class Partition():
 
         mkfs_cmd = "mkfs.%s %s %s %s -U %s -d %s" % \
             (self.fstype, extraopts, rootfs, label_str, self.fsuuid, rootfs_dir)
+        logger.info("mkfs_cmd(rootfs): %s" % mkfs_cmd)
         exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
 
         if self.updated_fstab_path and self.has_fstab and not self.no_fstab_update:
@@ -390,11 +394,13 @@ class Partition():
 
         size_str = ""
 
-        extraopts = self.mkfs_extraopts or '-S 512'
+        extraopts = self.mkfs_extraopts
+        extraopts += " -S %d" % self.sector_size
 
         dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
                     (label_str, self.fsuuid, size_str, extraopts, rootfs,
                      rootfs_size)
+        logger.info("dosfs_cmd(rootfs): %s" % dosfs_cmd)
         exec_native_cmd(dosfs_cmd, native_sysroot)
 
         mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
@@ -442,6 +448,8 @@ class Partition():
             os.ftruncate(sparse.fileno(), size * 1024)
 
         extraopts = self.mkfs_extraopts or "-i 8192"
+        if self.sector_size != 512:
+            extraopts += " -b %s" % self.sector_size
 
         # use hash_seed to generate reproducible ext4 images
         (extraopts, pseudo) = self.get_hash_seed_ext4(extraopts, None)
@@ -452,6 +460,7 @@ class Partition():
 
         mkfs_cmd = "mkfs.%s -F %s %s -U %s %s" % \
             (self.fstype, extraopts, label_str, self.fsuuid, rootfs)
+        logger.info("mkfs_cmd(empty): %s" % mkfs_cmd)
         exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
 
         self.check_for_Y2038_problem(rootfs, native_sysroot)
@@ -487,12 +496,13 @@ class Partition():
 
         size_str = ""
 
-        extraopts = self.mkfs_extraopts or '-S 512'
+        extraopts = self.mkfs_extraopts
+        extraopts += " -S %d" % self.sector_size
 
         dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
                     (label_str, self.fsuuid, extraopts, size_str, rootfs,
                      blocks)
-
+        logger.info("dosfs_cmd(empty): %s" % dosfs_cmd)
         exec_native_cmd(dosfs_cmd, native_sysroot)
 
         chmod_cmd = "chmod 644 %s" % rootfs
diff --git a/meta-xilinx-core/scripts/lib/wic/plugins/imager/direct.py b/meta-xilinx-core/scripts/lib/wic/plugins/imager/direct.py
index a1d15265..75aa0644 100644
--- a/meta-xilinx-core/scripts/lib/wic/plugins/imager/direct.py
+++ b/meta-xilinx-core/scripts/lib/wic/plugins/imager/direct.py
@@ -43,7 +43,7 @@ class DirectPlugin(ImagerPlugin):
     def __init__(self, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
                  native_sysroot, oe_builddir, options):
         try:
-            self.ks = KickStart(wks_file)
+            self.ks = KickStart(wks_file, options)
         except KickStartError as err:
             raise WicError(str(err))
 
@@ -60,6 +60,9 @@ class DirectPlugin(ImagerPlugin):
         self.bmap = options.bmap
         self.no_fstab_update = options.no_fstab_update
         self.updated_fstab_path = None
+        self.sector_size = options.sector_size
+        if self.sector_size != 512:
+            os.environ['PARTED_SECTOR_SIZE'] = "%d" % self.sector_size
 
         self.name = "%s-%s" % (os.path.splitext(os.path.basename(wks_file))[0],
                                strftime("%Y%m%d%H%M"))
@@ -77,8 +80,8 @@ class DirectPlugin(ImagerPlugin):
 
         image_path = self._full_path(self.workdir, self.parts[0].disk, "direct")
         self._image = PartitionedImage(image_path, self.ptable_format,
-                                       self.parts, self.native_sysroot,
-                                       options.extra_space)
+                                       self.parts, self.sector_size,
+                                       self.native_sysroot, options.extra_space)
 
     def setup_workdir(self, workdir):
         if workdir:
@@ -292,15 +295,12 @@ MBR_OVERHEAD = 1
 # Overhead of the GPT partitioning scheme
 GPT_OVERHEAD = 34
 
-# Size of a sector in bytes
-SECTOR_SIZE = 512
-
 class PartitionedImage():
     """
     Partitioned image in a file.
     """
 
-    def __init__(self, path, ptable_format, partitions, native_sysroot=None, extra_space=0):
+    def __init__(self, path, ptable_format, partitions, sector_size, native_sysroot=None, extra_space=0):
         self.path = path  # Path to the image file
         self.numpart = 0  # Number of allocated partitions
         self.realpart = 0 # Number of partitions in the partition table
@@ -321,7 +321,7 @@ class PartitionedImage():
         self.partitions = partitions
         self.partimages = []
         # Size of a sector used in calculations
-        self.sector_size = SECTOR_SIZE
+        self.sector_size = sector_size
         self.native_sysroot = native_sysroot
         num_real_partitions = len([p for p in self.partitions if not p.no_table])
         self.extra_space = extra_space
diff --git a/meta-xilinx-core/scripts/wic b/meta-xilinx-core/scripts/wic
index 06e0b48d..c0ba6d71 100755
--- a/meta-xilinx-core/scripts/wic
+++ b/meta-xilinx-core/scripts/wic
@@ -14,7 +14,7 @@
 # AUTHORS
 # Tom Zanussi <tom.zanussi (at] linux.intel.com>
 #
-__version__ = "0.2.0"
+__version__ = "0.2.0 (meta-xilinx-core)"
 
 # Python Standard Library modules
 import os
@@ -351,6 +351,8 @@ def wic_init_parser_create(subparser):
                       default="direct", help="the wic imager plugin")
     subparser.add_argument("--extra-space", type=int, dest="extra_space",
                       default=0, help="additional free disk space to add to the image")
+    subparser.add_argument("--sector-size", type=int, dest="sector_size",
+                      default=512, help="sector size to use")
     return