]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: keep rootfs_size as integer
authorAlexander Kanavin <alex.kanavin@gmail.com>
Fri, 17 Sep 2021 12:59:20 +0000 (14:59 +0200)
committerAnuj Mittal <anuj.mittal@intel.com>
Mon, 4 Oct 2021 02:46:18 +0000 (10:46 +0800)
The corrected line accidentally converted it to float,
which causes problems later on with python 3.10:

|   File "/home/alex/development/poky/scripts/lib/wic/partition.py", line 278, in prepare_rootfs_ext
|     os.ftruncate(sparse.fileno(), rootfs_size * 1024)
| TypeError: 'float' object cannot be interpreted as an integer

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d1d260dd2d196d10379ed9e238bcb34f39f3a3b7)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
scripts/lib/wic/partition.py

index 76d144d12d303d894d5e837923ac8009020d30f0..a0b7291a6bd9bea9e71f39fb642d34e734aba580 100644 (file)
@@ -104,7 +104,7 @@ class Partition():
                 extra_blocks = self.extra_space
 
             rootfs_size = actual_rootfs_size + extra_blocks
-            rootfs_size *= self.overhead_factor
+            rootfs_size = int(rootfs_size * self.overhead_factor)
 
             logger.debug("Added %d extra blocks to %s to get to %d total blocks",
                          extra_blocks, self.mountpoint, rootfs_size)