@@ -1125,7 +1125,7 @@ run_wic_cmd() {
return wkspath
- def _get_wic_partitions(self, wkspath, native_sysroot=None, ignore_status=False):
+ def _get_wic(self, wkspath, ignore_status=False):
p = runCmd("wic create %s -e core-image-minimal -o %s" % (wkspath, self.resultdir),
ignore_status=ignore_status)
@@ -1139,7 +1139,10 @@ run_wic_cmd() {
if not wicout:
return (p, None)
- wicimg = wicout[0]
+ return (p, wicout[0])
+
+ def _get_wic_partitions(self, wkspath, native_sysroot=None, ignore_status=False):
+ p, wicimg = self._get_wic(wkspath, ignore_status)
if not native_sysroot:
native_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
@@ -1279,6 +1282,54 @@ run_wic_cmd() {
size = int(size[:-3])
self.assertGreaterEqual(size, 204800)
+ def test_extra_part_space(self):
+ native_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
+
+ with NamedTemporaryFile("w", suffix=".wks") as tempf:
+ tempf.write("bootloader --ptable gpt\n" \
+ "part --ondisk hda --size 10M --extra-part-space 10M --fstype=ext4\n" \
+ "part --ondisk hda --fixed-size 20M --extra-part-space 10M --fstype=ext4\n" \
+ "part --source rootfs --ondisk hda --extra-part-space 10M --fstype=ext4\n" \
+ "part --source rootfs --ondisk hda --fixed-size 200M --extra-part-space 10M --fstype=ext4\n")
+ tempf.flush()
+
+ _, wicimg = self._get_wic(tempf.name)
+
+ res = runCmd("parted -m %s unit b p" % wicimg,
+ native_sysroot=native_sysroot, stderr=subprocess.PIPE)
+
+ # parse parted output which looks like this:
+ # BYT;\n
+ # /var/tmp/wic/build/tmpfwvjjkf_-201611101222-hda.direct:200MiB:file:512:512:msdos::;\n
+ # 1:0.00MiB:200MiB:200MiB:ext4::;\n
+ partlns = res.output.splitlines()[2:]
+
+ self.assertEqual(4, len(partlns))
+
+ # Test for each partitions that the extra part space exists
+ for part in range(0, len(partlns)):
+ part_file = os.path.join(self.resultdir, "selftest_img.part%d" % (part + 1))
+ partln = partlns[part].split(":")
+ self.assertEqual(7, len(partln))
+ self.assertRegex(partln[3], r'^[0-9]+B$')
+ part_size = int(partln[3].rstrip("B"))
+ start = int(partln[1].rstrip("B")) / 512
+ length = part_size / 512
+ runCmd("dd if=%s of=%s skip=%d count=%d" %
+ (wicimg, part_file, start, length))
+ res = runCmd("dumpe2fs %s -h | grep \"^Block count\"" % part_file)
+ fs_size = int(res.output.split(":")[1].strip()) * 1024
+ self.assertLessEqual(fs_size + 10485760, part_size, "part file: %s" % part_file)
+
+ with NamedTemporaryFile("w", suffix=".wks") as tempf:
+ # Test that image creation fails if space left is too small for the rootfs
+ tempf.write("bootloader --ptable gpt\n" \
+ "part --source rootfs --ondisk hda --fixed-size 200M --extra-part-space 150M --fstype=ext4\n")
+ tempf.flush()
+
+ p, _ = self._get_wic(tempf.name, ignore_status=True)
+ self.assertNotEqual(p.status, 0, "wic exited successfully when an error was expected:\n%s" % p.output)
+
# TODO this test could also work on aarch64
@skipIfNotArch(['i586', 'i686', 'x86_64'])
@OETestTag("runqemu")
@@ -154,6 +154,7 @@ class KickStart():
part.add_argument('--include-path', nargs='+', action='append')
part.add_argument('--change-directory')
part.add_argument("--extra-space", type=sizetype("M"))
+ part.add_argument('--extra-part-space', type=sizetype("M"))
part.add_argument('--fsoptions', dest='fsopts')
part.add_argument('--fspassno', dest='fspassno')
part.add_argument('--fstype', default='vfat',
@@ -259,6 +260,8 @@ class KickStart():
err = "%s:%d: Must set the label with --label" \
% (confpath, lineno)
raise KickStartError(err)
+ if not parsed.extra_part_space:
+ parsed.extra_part_space = 0
# using ArgumentParser one cannot easily tell if option
# was passed as argument, if said option has a default
# value; --overhead-factor/--extra-space cannot be used
@@ -32,6 +32,7 @@ class Partition():
self.exclude_path = args.exclude_path
self.include_path = args.include_path
self.change_directory = args.change_directory
+ self.extra_part_space = args.extra_part_space
self.fsopts = args.fsopts
self.fspassno = args.fspassno
self.fstype = args.fstype
@@ -91,17 +92,16 @@ class Partition():
def get_rootfs_size(self, actual_rootfs_size=0):
"""
Calculate the required size of rootfs taking into consideration
- --size/--fixed-size flags as well as overhead and extra space, as
- specified in kickstart file. Raises an error if the
- `actual_rootfs_size` is larger than fixed-size rootfs.
-
+ --size/--fixed-size and --extra-part-space flags as well as overhead
+ and extra space, as specified in kickstart file. Raises an error
+ if the `actual_rootfs_size` is larger than fixed-size rootfs.
"""
if self.fixed_size:
- rootfs_size = self.fixed_size
+ rootfs_size = self.fixed_size - self.extra_part_space
if actual_rootfs_size > rootfs_size:
raise WicError("Actual rootfs size (%d kB) is larger than "
- "allowed size %d kB" %
- (actual_rootfs_size, rootfs_size))
+ "allowed size %d kB (including %d kB extra part space)" %
+ (actual_rootfs_size, rootfs_size, self.extra_part_space))
else:
extra_blocks = self.get_extra_block_count(actual_rootfs_size)
if extra_blocks < self.extra_space:
@@ -119,10 +119,18 @@ class Partition():
def disk_size(self):
"""
Obtain on-disk size of partition taking into consideration
- --size/--fixed-size options.
+ --size/--fixed-size and --extra-part-space options.
+
+ """
+ return self.fixed_size if self.fixed_size else self.size + self.extra_part_space
+ @property
+ def fs_size(self):
+ """
+ Obtain on-disk size of filesystem inside the partition taking into
+ consideration --size/--fixed-size and --extra-part-space options.
"""
- return self.fixed_size if self.fixed_size else self.size
+ return self.fixed_size - self.extra_part_space if self.fixed_size else self.size
def prepare(self, creator, cr_workdir, oe_builddir, rootfs_dir,
bootimg_dir, kernel_dir, native_sysroot, updated_fstab_path):
@@ -202,10 +210,10 @@ class Partition():
"This a bug in source plugin %s and needs to be fixed." %
(self.mountpoint, self.source))
- if self.fixed_size and self.size > self.fixed_size:
+ if self.fixed_size and self.size + self.extra_part_space > self.fixed_size:
raise WicError("File system image of partition %s is "
- "larger (%d kB) than its allowed size %d kB" %
- (self.mountpoint, self.size, self.fixed_size))
+ "larger (%d kB + %d kB extra part space) than its allowed size %d kB" %
+ (self.mountpoint, self.size, self.extra_part_space, self.fixed_size))
def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir,
native_sysroot, real_rootfs = True, pseudo_dir = None):
@@ -440,7 +448,7 @@ class Partition():
"""
Prepare an empty ext2/3/4 partition.
"""
- size = self.disk_size
+ size = self.fs_size
with open(rootfs, 'w') as sparse:
os.ftruncate(sparse.fileno(), size * 1024)
@@ -464,7 +472,7 @@ class Partition():
"""
Prepare an empty btrfs partition.
"""
- size = self.disk_size
+ size = self.fs_size
with open(rootfs, 'w') as sparse:
os.ftruncate(sparse.fileno(), size * 1024)
@@ -482,7 +490,7 @@ class Partition():
"""
Prepare an empty vfat partition.
"""
- blocks = self.disk_size
+ blocks = self.fs_size
label_str = "-n boot"
if self.label: