diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ea77ab8878..039feec792 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -455,8 +455,7 @@ def get_rootfs_size(d): | |||
455 | d.getVar('IMAGE_ROOTFS', True)]) | 455 | d.getVar('IMAGE_ROOTFS', True)]) |
456 | size_kb = int(output.split()[0]) | 456 | size_kb = int(output.split()[0]) |
457 | base_size = size_kb * overhead_factor | 457 | base_size = size_kb * overhead_factor |
458 | base_size = (base_size, rootfs_req_size)[base_size < rootfs_req_size] + \ | 458 | base_size = max(base_size, rootfs_req_size) + rootfs_extra_space |
459 | rootfs_extra_space | ||
460 | 459 | ||
461 | if base_size != int(base_size): | 460 | if base_size != int(base_size): |
462 | base_size = int(base_size + 1) | 461 | base_size = int(base_size + 1) |
@@ -544,4 +543,3 @@ do_bundle_initramfs () { | |||
544 | : | 543 | : |
545 | } | 544 | } |
546 | addtask bundle_initramfs after do_image_complete | 545 | addtask bundle_initramfs after do_image_complete |
547 | |||