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] (From OE-Core rev: 2f676dadebebc461c1e01e0b6da3cb2258829048) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b94de9a24a
commit
adac5a690f
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue