image.bbclass: Use IMAGE_ROOTFS_SIZE if the image will fit into it and only add extra...

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f16dcc20ff02812ff08fb2506c78f43f2cd76aca..8225980f73aa61fb916a2570a51d81b7af41d912 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -126,7 +126,7 @@ fakeroot do_rootfs () {
 
        ${IMAGE_PREPROCESS_COMMAND}
 
-       ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{print ${IMAGE_EXTRA_SPACE} + $1}'`
+       ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = ${IMAGE_EXTRA_SPACE} + $1; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
        ${@get_imagecmds(d)}
 
        ${IMAGE_POSTPROCESS_COMMAND}