summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/image.bbclass2
-rw-r--r--conf/bitbake.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 901ab340ae..c493c73c01 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -107,7 +107,7 @@ fakeroot do_rootfs () {
${IMAGE_PREPROCESS_COMMAND}
- ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{print ${IMAGE_EXTRA_SPACE} + $1}'`
+ ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = ${IMAGE_EXTRA_SPACE} + $1; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
${@get_imagecmds(d)}
${IMAGE_POSTPROCESS_COMMAND}
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2c6979a9ca..c01da861e8 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -605,6 +605,7 @@ IMAGE_FSTYPES ?= "tar.gz"
PCMCIA_MANAGER ?= "pcmcia-cs"
DEFAULT_TASK_PROVIDER ?= "task-base"
MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
+IMAGE_ROOTFS_SIZE ?= "65536"
IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
IMAGE_ROOTFS_SIZE_ext3 ?= "65536"