From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 23 Jan 2009 16:24:46 +0000 (+0000)
Subject: image.bbclass: Use IMAGE_ROOTFS_SIZE if the image will fit into it and only add extra... 
X-Git-Tag: yocto-4.0~47278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c92acf4b05329a8c08564a2c0f7f256810c5a1d2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

image.bbclass: Use IMAGE_ROOTFS_SIZE if the image will fit into it and only add extra space if the image is too small (ported from OE by hrw)
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f16dcc20ff0..8225980f73a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -126,7 +126,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}