mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

image.bbclass: Move ROOTFS_SIZE into runimagecmd() function

Browse Source 
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:
Richard Purdie
2011-03-24 12:29:19 +00:00
parent b94de9a24a
commit adac5a690f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image.bbclass
+1 -1
View File
@@ -79,6 +79,7 @@ def get_imagecmds(d):
runimagecmd () { runimagecmd () {
# Image generation code for image type ${type} # 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} ${cmd}
cd ${DEPLOY_DIR_IMAGE}/ cd ${DEPLOY_DIR_IMAGE}/
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type} rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
@@ -134,7 +135,6 @@ fakeroot do_rootfs () {
${IMAGE_PREPROCESS_COMMAND} ${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)} ${@get_imagecmds(d)}
${IMAGE_POSTPROCESS_COMMAND} ${IMAGE_POSTPROCESS_COMMAND}