wic support different sector size
cover wic support different sector size
v1: wic support different sector size
Vince Chang (2):
wic: add WIC_SECTOR_SIZE variable
util-linux: sfdisk sector size improvements
meta/recipes-core/util-linux/util-linux.inc | 1 + ...-and-sfdisk-sector-size-improvements.patch | 252 ++++++++++++++++++ scripts/lib/wic/plugins/imager/direct.py | 56 ++-- 3 files changed, 286 insertions(+), 23 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/libfdisk-cfdisk-and-sfdisk-sector-size-improvements.patch
Signature · 1 line
2.25.1
PATCH 1/2 wic: add WIC_SECTOR_SIZE variable
Currently WIC is unable to generate images that requires a sector size different of 512. Add WIC_SECTOR_SIZE variable to handle the sector size of 4096 for UFS.
--- scripts/lib/wic/plugins/imager/direct.py | 56 ++++++++++++++---------- 1 file changed, 33 insertions(+), 23 deletions(-)
scripts/lib/wic/plugins/imager/direct.py +33 -23
@@ -321,7 +321,15 @@ class PartitionedImage(): self.partitions = partitions self.partimages = [] # Size of a sector used in calculations - self.sector_size = SECTOR_SIZE + sector_size_str = get_bitbake_var('WIC_SECTOR_SIZE') + if sector_size_str is not None: + try: + self.sector_size = int(sector_size_str) + except ValueError: + self.sector_size = SECTOR_SIZE + else: + 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
@@ -508,7 +516,8 @@ class PartitionedImage(): logger.debug("Added '%s' partition, sectors %d-%d, size %d sectors", parttype, start, end, size) - cmd = "parted -s %s unit s mkpart %s" % (device, parttype) + cmd = "export PARTED_SECTOR_SIZE=%d; parted -s %s unit s mkpart %s" % \ + (self.sector_size, device, parttype) if fstype: cmd += " %s" % fstype cmd += " %d %d" % (start, end)
@@ -527,8 +536,8 @@ class PartitionedImage(): os.ftruncate(sparse.fileno(), min_size) logger.debug("Initializing partition table for %s", device) - exec_native_cmd("parted -s %s mklabel %s" % (device, ptable_format), - self.native_sysroot) + exec_native_cmd("export PARTED_SECTOR_SIZE=%d; parted -s %s mklabel %s" % + (self.sector_size, device, ptable_format), self.native_sysroot) def _write_disk_guid(self): if self.ptable_format in ('gpt', 'gpt-hybrid'):
@@ -538,7 +547,8 @@ class PartitionedImage(): self.disk_guid = uuid.uuid4() logger.debug("Set disk guid %s", self.disk_guid) - sfdisk_cmd = "sfdisk --disk-id %s %s" % (self.path, self.disk_guid) + sfdisk_cmd = "sfdisk --sector-size %s --disk-id %s %s" % \ + (self.sector_size, self.path, self.disk_guid) exec_native_cmd(sfdisk_cmd, self.native_sysroot) def create(self):
@@ -613,45 +623,44 @@ class PartitionedImage(): partition_label = part.part_name if part.part_name else part.label logger.debug("partition %d: set name to %s", part.num, partition_label) - exec_native_cmd("sgdisk --change-name=%d:%s %s" % \ - (part.num, partition_label, - self.path), self.native_sysroot) - + exec_native_cmd("sfdisk --sector-size %s --part-label %s %d %s" % \ + (self.sector_size, self.path, part.num, + partition_label), self.native_sysroot) if part.part_type: logger.debug("partition %d: set type UID to %s", part.num, part.part_type) - exec_native_cmd("sgdisk --typecode=%d:%s %s" % \ - (part.num, part.part_type, - self.path), self.native_sysroot) + exec_native_cmd("sfdisk --sector-size %s --part-type %s %d %s" % \ + (self.sector_size, self.path, part.num, + part.part_type), self.native_sysroot) if part.uuid and self.ptable_format in ("gpt", "gpt-hybrid"): logger.debug("partition %d: set UUID to %s", part.num, part.uuid) - exec_native_cmd("sgdisk --partition-guid=%d:%s %s" % \ - (part.num, part.uuid, self.path), + exec_native_cmd("sfdisk --sector-size %s --part-uuid %s %d %s" % \ + (self.sector_size, self.path, part.num, part.uuid), self.native_sysroot) if part.active: flag_name = "legacy_boot" if self.ptable_format in ('gpt', 'gpt-hybrid') else "boot" logger.debug("Set '%s' flag for partition '%s' on disk '%s'", flag_name, part.num, self.path) - exec_native_cmd("parted -s %s set %d %s on" % \ - (self.path, part.num, flag_name), + exec_native_cmd("export PARTED_SECTOR_SIZE=%d; parted -s %s set %d %s on" % \ + (self.sector_size, self.path, part.num, flag_name), self.native_sysroot) if self.ptable_format == 'gpt-hybrid' and part.mbr: - exec_native_cmd("parted -s %s set %d %s on" % \ - (mbr_path, hybrid_mbr_part_num, "boot"), + exec_native_cmd("export PARTED_SECTOR_SIZE=%d; parted -s %s set %d %s on" % \ + (self.sector_size, mbr_path, hybrid_mbr_part_num, "boot"), self.native_sysroot) if part.system_id: - exec_native_cmd("sfdisk --part-type %s %s %s" % \ - (self.path, part.num, part.system_id), + exec_native_cmd("sfdisk --sector-size %s --part-type %s %s %s" % \ + (self.sector_size, self.path, part.num, part.system_id), self.native_sysroot) if part.hidden and self.ptable_format == "gpt": logger.debug("Set hidden attribute for partition '%s' on disk '%s'", part.num, self.path) - exec_native_cmd("sfdisk --part-attrs %s %s RequiredPartition" % \ - (self.path, part.num), + exec_native_cmd("sfdisk --sector-size %s --part-attrs %s %s RequiredPartition" % \ + (self.sector_size, self.path, part.num), self.native_sysroot) if self.ptable_format == "gpt-hybrid":
@@ -664,7 +673,8 @@ class PartitionedImage(): # create with an arbitrary type, then change it to the correct type # with sfdisk self._create_partition(mbr_path, "primary", "fat32", 1, GPT_OVERHEAD) - exec_native_cmd("sfdisk --part-type %s %d 0xee" % (mbr_path, hybrid_mbr_part_num), + exec_native_cmd("sfdisk --sector-size %s --part-type %s %d 0xee" % \ + (self.sector_size, mbr_path, hybrid_mbr_part_num), self.native_sysroot) # Copy hybrid MBR
Signature · 1 line
2.25.1
Re: [OE-core] [PATCH v1 1/2] wic: add WIC_SECTOR_SIZE variable
Hi Vince,
Quoted 5 lines · Vince Chang via lists.openembedded.org
Currently WIC is unable to generate images that requires a sector size different of 512. Add
WIC_SECTOR_SIZEvariable to handle the sector size of 4096 for UFS.
Nice patch, thanks.
To ensure it doesn’t regress in the future, can you also add a quick test to oe-selftest to verify that if you build a small image with a different sector size, the output actually has used that size?
Thanks,
Ross
RE: [OE-core] [PATCH v1 1/2] wic: add WIC_SECTOR_SIZE variable
Hi Ross,
Quoted 5 lines · Ross Burton
To ensure it doesn’t regress in the future, can you also add a quick test to oe-selftest to verify that if you build a small image with a different sector size, the output actually has used that size?
I will add a test case to oe-selftest and update it in the next patch.
Thanks,
Vince
PATCH 2/2 util-linux: sfdisk sector size improvements
In reply to Vince ChangRefer to https://github.com/util-linux/util-linux/pull/3237.
--- meta/recipes-core/util-linux/util-linux.inc | 1 + ...-and-sfdisk-sector-size-improvements.patch | 252 ++++++++++++++++++ 2 files changed, 253 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/libfdisk-cfdisk-and-sfdisk-sector-size-improvements.patch
meta/recipes-core/util-linux/util-linux.inc +1 -0
@@ -39,6 +39,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://avoid_parallel_tests.patch \ file://fcntl-lock.c \ file://0001-Revert-autotools-make-pam-install-path-configurable.patch \ + file://libfdisk-cfdisk-and-sfdisk-sector-size-improvements.patch \ " SRC_URI[sha256sum] = "d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3"
meta/recipes-core/util-linux/util-linux/libfdisk-cfdisk-and-sfdisk-sector-size-improvements.patch new file +252 -0
252 lines not on this page · raw message
Signature · 1 line
2.25.1