summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-09-17 14:59:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-07 15:10:40 +0100
commit24bd54d098d54cb80f570b4a1f8a0c1c6e70011a (patch)
tree9be8495838fce03934b6b364710104dbad7e0950 /scripts
parentdbfbe31cffafd429b1a8db0cd976d4ef28ced51c (diff)
downloadpoky-24bd54d098d54cb80f570b4a1f8a0c1c6e70011a.tar.gz
wic: keep rootfs_size as integer
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 (From OE-Core rev: 5b6cd58a000c4a1eaac95e37a047838df6478305) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/partition.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 76d144d12d..a0b7291a6b 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -104,7 +104,7 @@ class Partition():
104 extra_blocks = self.extra_space 104 extra_blocks = self.extra_space
105 105
106 rootfs_size = actual_rootfs_size + extra_blocks 106 rootfs_size = actual_rootfs_size + extra_blocks
107 rootfs_size *= self.overhead_factor 107 rootfs_size = int(rootfs_size * self.overhead_factor)
108 108
109 logger.debug("Added %d extra blocks to %s to get to %d total blocks", 109 logger.debug("Added %d extra blocks to %s to get to %d total blocks",
110 extra_blocks, self.mountpoint, rootfs_size) 110 extra_blocks, self.mountpoint, rootfs_size)