From: Denys Dmytriyenko <denis@denix.org>
Date: Fri, 5 Dec 2008 17:48:06 +0000 (-0500)
Subject: image.bbclass: resize images (ext2/ext3) only if they are bigger then IMAGE_ROOTFS_SIZE
X-Git-Tag: Release-2010-05/1~4223
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d7586e655755f51be3f09f3da48147b0937c3e1;p=openembedded.git

image.bbclass: resize images (ext2/ext3) only if they are bigger then IMAGE_ROOTFS_SIZE
---

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"