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

wic: rename wks flag --extra-space to --extra-filesystem-space

Browse Source 
Makes a clear distinction with --extra-partition-space flag.

(From OE-Core rev: 39d10137b86ebb6d1f20c36ae50a7771e6c76251)

Signed-off-by: Pierre-Loup GOSSE <pierre-loup.gosse@smile.fr>

CC: Alexander Kanavin <alex.kanavin@gmail.com>
CC: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pierre-Loup GOSSE
2025-09-03 16:45:28 +02:00
committed by Richard Purdie
parent 21d98bd960
commit 468bcd1950
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/lib/oeqa/selftest/cases/wic.py
View File

@@ -1311,12 +1311,12 @@ run_wic_cmd() {
p, _ = self._get_wic_partitions(tempf.name, ignore_status=True) p, _ = self._get_wic_partitions(tempf.name, ignore_status=True)
self.assertNotEqual(p.status, 0, "wic exited successfully when an error was expected:\n%s" % p.output) self.assertNotEqual(p.status, 0, "wic exited successfully when an error was expected:\n%s" % p.output)
def test_extra_space(self): def test_extra_filesystem_space(self):
native_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "wic-tools") native_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
with NamedTemporaryFile("w", suffix=".wks") as tempf: with NamedTemporaryFile("w", suffix=".wks") as tempf:
tempf.write("bootloader --ptable gpt\n" \ tempf.write("bootloader --ptable gpt\n" \
"part / --source rootfs --ondisk hda --extra-space 200M --fstype=ext4\n") "part / --source rootfs --ondisk hda --extra-filesystem-space 200M --fstype=ext4\n")
tempf.flush() tempf.flush()
_, partlns = self._get_wic_partitions(tempf.name, native_sysroot) _, partlns = self._get_wic_partitions(tempf.name, native_sysroot)

12
scripts/lib/wic/help.py
View File

@@ -1013,12 +1013,12 @@ DESCRIPTION
--no-fstab-update: This option is specific to wic. It does not update the --no-fstab-update: This option is specific to wic. It does not update the
'/etc/fstab' stock file for the given partition. '/etc/fstab' stock file for the given partition.
--extra-space: This option is specific to wic. It adds extra --extra-filesystem-space: This option is specific to wic. It adds extra
space after the space filled by the content space after the space filled by the content
of the partition. The final size can go of the partition. The final size can go
beyond the size specified by --size. beyond the size specified by --size.
By default, 10MB. This option cannot be used By default, 10MB. This option cannot be used
with --fixed-size option. with --fixed-size option.
--extra-partition-space: This option is specific to wic. It adds extra --extra-partition-space: This option is specific to wic. It adds extra
empty space after the space filled by the empty space after the space filled by the

25
scripts/lib/wic/ksparser.py
View File

@@ -132,7 +132,7 @@ def systemidtype(arg):
class KickStart(): class KickStart():
"""Kickstart parser implementation.""" """Kickstart parser implementation."""
DEFAULT_EXTRA_SPACE = 10*1024 DEFAULT_EXTRA_FILESYSTEM_SPACE = 10*1024
DEFAULT_OVERHEAD_FACTOR = 1.3 DEFAULT_OVERHEAD_FACTOR = 1.3
def __init__(self, confpath): def __init__(self, confpath):
@@ -153,7 +153,7 @@ class KickStart():
part.add_argument('--exclude-path', nargs='+') part.add_argument('--exclude-path', nargs='+')
part.add_argument('--include-path', nargs='+', action='append') part.add_argument('--include-path', nargs='+', action='append')
part.add_argument('--change-directory') part.add_argument('--change-directory')
part.add_argument("--extra-space", type=sizetype("M")) part.add_argument('--extra-filesystem-space', type=sizetype("M"))
part.add_argument('--extra-partition-space', type=sizetype("M")) part.add_argument('--extra-partition-space', type=sizetype("M"))
part.add_argument('--fsoptions', dest='fsopts') part.add_argument('--fsoptions', dest='fsopts')
part.add_argument('--fspassno', dest='fspassno') part.add_argument('--fspassno', dest='fspassno')
@@ -175,9 +175,9 @@ class KickStart():
part.add_argument('--hidden', action='store_true') part.add_argument('--hidden', action='store_true')
# --size and --fixed-size cannot be specified together; options # --size and --fixed-size cannot be specified together; options
# ----extra-space and --overhead-factor should also raise a parser # ----extra-filesystem-space and --overhead-factor should also raise a
# --error, but since nesting mutually exclusive groups does not work, # parser error, but since nesting mutually exclusive groups does not work,
# ----extra-space/--overhead-factor are handled later # ----extra-filesystem-space/--overhead-factor are handled later
sizeexcl = part.add_mutually_exclusive_group() sizeexcl = part.add_mutually_exclusive_group()
sizeexcl.add_argument('--size', type=sizetype("M"), default=0) sizeexcl.add_argument('--size', type=sizetype("M"), default=0)
sizeexcl.add_argument('--fixed-size', type=sizetype("M"), default=0) sizeexcl.add_argument('--fixed-size', type=sizetype("M"), default=0)
@@ -264,12 +264,13 @@ class KickStart():
parsed.extra_partition_space = 0 parsed.extra_partition_space = 0
# using ArgumentParser one cannot easily tell if option # using ArgumentParser one cannot easily tell if option
# was passed as argument, if said option has a default # was passed as argument, if said option has a default
# value; --overhead-factor/--extra-space cannot be used # value; --overhead-factor/--extra-filesystem-space
# with --fixed-size, so at least detect when these were # cannot be used with --fixed-size, so at least detect
# passed with non-0 values ... # when these were passed with non-0 values ...
if parsed.fixed_size: if parsed.fixed_size:
if parsed.overhead_factor or parsed.extra_space: if parsed.overhead_factor or parsed.extra_filesystem_space:
err = "%s:%d: arguments --overhead-factor and --extra-space not "\ err = "%s:%d: arguments --overhead-factor and "\
"--extra-filesystem-space not "\
"allowed with argument --fixed-size" \ "allowed with argument --fixed-size" \
% (confpath, lineno) % (confpath, lineno)
raise KickStartError(err) raise KickStartError(err)
@@ -280,8 +281,8 @@ class KickStart():
# with value equal to 0) # with value equal to 0)
if not parsed.overhead_factor: if not parsed.overhead_factor:
parsed.overhead_factor = self.DEFAULT_OVERHEAD_FACTOR parsed.overhead_factor = self.DEFAULT_OVERHEAD_FACTOR
if not parsed.extra_space: if not parsed.extra_filesystem_space:
parsed.extra_space = self.DEFAULT_EXTRA_SPACE parsed.extra_filesystem_space = self.DEFAULT_EXTRA_FILESYSTEM_SPACE
self.partnum += 1 self.partnum += 1
self.partitions.append(Partition(parsed, self.partnum)) self.partitions.append(Partition(parsed, self.partnum))

6
scripts/lib/wic/partition.py
View File

@@ -28,7 +28,7 @@ class Partition():
self.align = args.align self.align = args.align
self.disk = args.disk self.disk = args.disk
self.device = None self.device = None
self.extra_space = args.extra_space self.extra_filesystem_space = args.extra_filesystem_space
self.extra_partition_space = args.extra_partition_space self.extra_partition_space = args.extra_partition_space
self.exclude_path = args.exclude_path self.exclude_path = args.exclude_path
self.include_path = args.include_path self.include_path = args.include_path
@@ -104,8 +104,8 @@ class Partition():
(actual_rootfs_size, rootfs_size)) (actual_rootfs_size, rootfs_size))
else: else:
extra_blocks = self.get_extra_block_count(actual_rootfs_size) extra_blocks = self.get_extra_block_count(actual_rootfs_size)
if extra_blocks < self.extra_space: if extra_blocks < self.extra_filesystem_space:
extra_blocks = self.extra_space extra_blocks = self.extra_filesystem_space
rootfs_size = actual_rootfs_size + extra_blocks rootfs_size = actual_rootfs_size + extra_blocks
rootfs_size = int(rootfs_size * self.overhead_factor) rootfs_size = int(rootfs_size * self.overhead_factor)