From: Laurentiu Palcu Date: Thu, 30 Jan 2014 12:40:48 +0000 (+0200) Subject: lib/oe/image.py: fix image size calculation routine X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34544 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3ac2a68ae0ae9bdf2a03c1b6d0f83c9918d58bd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git lib/oe/image.py: fix image size calculation routine The IMAGE_ROOTFS_EXTRA_SPACE value was not correctly added to the base size. Signed-off-by: Laurentiu Palcu --- diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py index 0049d464723..ccc849da29b 100644 --- a/meta/lib/oe/image.py +++ b/meta/lib/oe/image.py @@ -34,8 +34,8 @@ class Image(object): self.d.getVar('IMAGE_ROOTFS', True)]) size_kb = int(output.split()[0]) base_size = size_kb * overhead_factor - if base_size < rootfs_req_size: - base_size = rootfs_req_size + rootfs_extra_space + base_size = (base_size, rootfs_req_size)[base_size < rootfs_req_size] + \ + rootfs_extra_space if base_size != int(base_size): base_size = int(base_size + 1)