diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-24 12:29:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-24 12:29:24 +0000 |
| commit | 2f676dadebebc461c1e01e0b6da3cb2258829048 (patch) | |
| tree | 5bd5d886667d322120d21013b9dee341c89937e7 /meta/classes | |
| parent | da5d038f955bf47155a0f217dba2f96e263bcad8 (diff) | |
| download | openembedded-core-2f676dadebebc461c1e01e0b6da3cb2258829048.tar.gz openembedded-core-2f676dadebebc461c1e01e0b6da3cb2258829048.tar.bz2 openembedded-core-2f676dadebebc461c1e01e0b6da3cb2258829048.zip | |
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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2ff6a1d168..eb0d970a2c 100644 --- 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} |