diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-09-17 14:59:20 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-30 00:02:22 +0100 |
| commit | 1f66c623de8d4f708c9f7658e4626609660077c8 (patch) | |
| tree | 2b54c0acfbc965883ac554faf9c017b620e79725 /scripts | |
| parent | c2ee49ce117d66bc3991e11339b071002128eeb8 (diff) | |
| download | poky-1f66c623de8d4f708c9f7658e4626609660077c8.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: 098195ecefafa4082bb5d27ff1c8b1b7b8e222d5)
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: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/partition.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 85f9847047..792bb3dcd3 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) |