lib/oe/image.py: fix image size calculation routine

The IMAGE_ROOTFS_EXTRA_SPACE value was not correctly added to the base
size.

(From OE-Core rev: f3ac2a68ae0ae9bdf2a03c1b6d0f83c9918d58bd)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 0049d46472..ccc849da29 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)