summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-23 23:22:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-25 15:50:57 +0100
commita3d6defd6365b6eae717bcf3568916306650db8a (patch)
tree14e7e0639329a58ac8b0f49065d2fdf34f67b378 /meta
parent470c0fee68418bed0fff0f507a64ed3ba131b746 (diff)
downloadpoky-a3d6defd6365b6eae717bcf3568916306650db8a.tar.gz
image_types: add IMAGE_ROOTFS_EXTRA_SPACE
[YOCTO #886] This address 2 needs after the IMAGE_ROOTFS_SIZE is cleaned up, by removing the _ext2/3 overrides it allows for a cleaner override using IMAGE_ROOTFS_SIZE to create a large rootfs, or by setting the IMAGE_ROOTFS_EXTRA_SPACE, will allow for extra space allocated in Kilobytes above the base size (determined by du of the rootfs * IMAGE_OVERHEAD_FACTOR, default of 1.3). (From OE-Core rev: 367934ada7c081ba3fc95f02dc14c7d6f97bfccb) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image_types.bbclass2
-rw-r--r--meta/conf/bitbake.conf4
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 69f859e39b..601a5fbb4d 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -13,7 +13,7 @@ def get_imagecmds(d):
13 13
14runimagecmd () { 14runimagecmd () {
15 # Image generation code for image type ${type} 15 # Image generation code for image type ${type}
16 ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'` 16 ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE}; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
17 ${cmd} 17 ${cmd}
18 cd ${DEPLOY_DIR_IMAGE}/ 18 cd ${DEPLOY_DIR_IMAGE}/
19 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type} 19 rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 18028f3001..35fd6f864f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -350,6 +350,10 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
350# This option allows for a precentage overage of the actaul image size rather than a 350# This option allows for a precentage overage of the actaul image size rather than a
351# fixed extra space 351# fixed extra space
352IMAGE_OVERHEAD_FACTOR ?= 1.3 352IMAGE_OVERHEAD_FACTOR ?= 1.3
353# This option allow for adding addition space in K above and beyond what the
354# IMAGE_OVERHEAD_FACTOR might add. To set a fixed size then overrideing IMAGE_ROOTFS_SIZE
355# with the max size one wants should do the trick
356IMAGE_ROOTFS_EXTRA_SPACE = "0"
353 357
354EXTRA_IMAGEDEPENDS = "" 358EXTRA_IMAGEDEPENDS = ""
355 359