From 4031de53f4dd2887862ac259b666206e20ab0812 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 7 Sep 2015 13:01:13 +0300 Subject: wic: round variable before converting to int Wic uses bitbake variable ROOTFS_SIZE to set correspondent partition size. This variable is a literal representing float value. Wic crashes trying to convert it to int with the error: invalid literal for int() with base 10: '10166.0' Fixed this by converting variable to float and rounding result. This should work for int and float literals. (From OE-Core rev: 3479e299b5f11dfcd3f5f97c4ad3e0449f6c6d6a) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib/wic/imager/direct.py') diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 31c0edc7d3..146a0d1535 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -242,7 +242,7 @@ class DirectImageCreator(BaseImageCreator): rsize_bb = get_bitbake_var('ROOTFS_SIZE', image_name) if rsize_bb: # convert from Kb to Mb - part.size = int(rsize_bb) / 1024 + part.size = int(round(float(rsize_bb) / 1024.)) # need to create the filesystems in order to get their # sizes before we can add them and do the layout. # Image.create() actually calls __format_disks() to create -- cgit v1.2.3-54-g00ecf