summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-01-30 14:40:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:53:43 +0000
commitb76f240df03e15282aa9f6ed62ed121fb1657d8a (patch)
treea0236b0cd35ac73a5f1f983a8b1b473d59fa57b8
parentce12c1bf9f06299de0b09ca3e44e051f9928f030 (diff)
downloadpoky-b76f240df03e15282aa9f6ed62ed121fb1657d8a.tar.gz
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>
-rw-r--r--meta/lib/oe/image.py4
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):
34 self.d.getVar('IMAGE_ROOTFS', True)]) 34 self.d.getVar('IMAGE_ROOTFS', True)])
35 size_kb = int(output.split()[0]) 35 size_kb = int(output.split()[0])
36 base_size = size_kb * overhead_factor 36 base_size = size_kb * overhead_factor
37 if base_size < rootfs_req_size: 37 base_size = (base_size, rootfs_req_size)[base_size < rootfs_req_size] + \
38 base_size = rootfs_req_size + rootfs_extra_space 38 rootfs_extra_space
39 39
40 if base_size != int(base_size): 40 if base_size != int(base_size):
41 base_size = int(base_size + 1) 41 base_size = int(base_size + 1)