summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-24 12:29:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-24 12:34:05 +0000
commitadac5a690fd5b4239bb59ec54e3e5174dbcf29e9 (patch)
treec3f53da02b5f51f79d7d313ca27b697723e61871 /meta/classes
parentb94de9a24ae89b6f6cc177774722e4b0e70e0db8 (diff)
downloadpoky-adac5a690fd5b4239bb59ec54e3e5174dbcf29e9.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
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):
79 79
80runimagecmd () { 80runimagecmd () {
81 # Image generation code for image type ${type} 81 # Image generation code for image type ${type}
82 ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
82 ${cmd} 83 ${cmd}
83 cd ${DEPLOY_DIR_IMAGE}/ 84 cd ${DEPLOY_DIR_IMAGE}/
84 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type} 85 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
@@ -134,7 +135,6 @@ fakeroot do_rootfs () {
134 135
135 ${IMAGE_PREPROCESS_COMMAND} 136 ${IMAGE_PREPROCESS_COMMAND}
136 137
137 ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
138 ${@get_imagecmds(d)} 138 ${@get_imagecmds(d)}
139 139
140 ${IMAGE_POSTPROCESS_COMMAND} 140 ${IMAGE_POSTPROCESS_COMMAND}