diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-01-30 14:40:48 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:53:43 +0000 |
| commit | b76f240df03e15282aa9f6ed62ed121fb1657d8a (patch) | |
| tree | a0236b0cd35ac73a5f1f983a8b1b473d59fa57b8 /meta | |
| parent | ce12c1bf9f06299de0b09ca3e44e051f9928f030 (diff) | |
| download | ast2050-yocto-poky-b76f240df03e15282aa9f6ed62ed121fb1657d8a.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/image.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py index 0049d46..ccc849d 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) |
