image.bbclass: Move ROOTFS_SIZE into runimagecmd() function

Image type specific size overrides for IMAGE_ROOTFS were being ignored.
Moving the size calculation to after the overide expansion point addresses
this problem.

[YOCTO #928]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2ff6a1d168dd7c908520f9402bf33f1518de5246..eb0d970a2cdb932cc40d8a51115c00400fe6bde7 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -79,6 +79,7 @@ def get_imagecmds(d):
 
 runimagecmd () {
        # Image generation code for image type ${type}
+       ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
        ${cmd}
        cd ${DEPLOY_DIR_IMAGE}/
        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
@@ -134,7 +135,6 @@ fakeroot do_rootfs () {
 
        ${IMAGE_PREPROCESS_COMMAND}
 
-       ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
        ${@get_imagecmds(d)}
 
        ${IMAGE_POSTPROCESS_COMMAND}