image.bbclass: resize images (ext2/ext3) only if they are bigger then IMAGE_ROOTFS_SIZE

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 901ab340aee0cf1708ed4568f5fe1694f46a4300..c493c73c01fc53bafd2f550127e056a2a3d5abb7 100644 (file)
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -107,7 +107,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}

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2c6979a9ca181dd47da3d3f12adb055c254577b5..c01da861e89694c27aeccc19db7a4d2c1d1eee08 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -605,6 +605,7 @@ IMAGE_FSTYPES ?= "tar.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
+IMAGE_ROOTFS_SIZE ?= "65536"
 IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 IMAGE_ROOTFS_SIZE_ext3 ?= "65536"