From c54879b54875abece53b1f64072cfacbd2e1970e Mon Sep 17 00:00:00 2001
From: YOUR_NAME <zhangfanfan2@huawei.com>
Date: Fri, 4 Jun 2021 14:53:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E8=AE=A1=E7=AE=97=E7=9A=84rootfs?=
 =?UTF-8?q?=E7=9A=84size=E5=81=8F=E5=B0=8F=EF=BC=8C=E5=AF=BC=E8=87=B4mcopy?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84disk=20full=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

构建环境的分区文件系统格式不同，会引起du命令计算文件夹size不同，当制作fat格式
的rootfs时，计算的rootfs文件夹的size比fat格式下的小， 则会导致mcopy过程出现
disk full错误。当前通过修正du计算的rootfs文件夹size的方式处理该问题。

close: #I3IA06

Signed-off-by: YOUR_NAME <zhangfanfan2@huawei.com>
Change-Id: I19c66e35c4382d768e020531a869e1e9186032a7
---
 tools/scripts/make_rootfs/rootfsimg.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/scripts/make_rootfs/rootfsimg.sh b/tools/scripts/make_rootfs/rootfsimg.sh
index 25b25daf..21e95b20 100755
--- a/tools/scripts/make_rootfs/rootfsimg.sh
+++ b/tools/scripts/make_rootfs/rootfsimg.sh
@@ -84,7 +84,9 @@ elif [ "${FSTYPE}" = "vfat" ]; then
             FAT32_ITEM_SIZE=4
             RESV_CNT=38
             IMG_MIN_SIZE=1048576
-            DIR_SIZE=$(( $(echo $(du -s ${ROOTFS_DIR} | awk '{print $1}')) * 1024 ))
+            DU_DIR_SIZE=$(( $(echo $(du -s ${ROOTFS_DIR} | awk '{print $1}')) * 1024 ))
+            DIR_NUM=$(( $(echo $(ls -lR ${ROOTFS_DIR} | grep "^d" | wc -l | awk '{print $1}')) + 1 ))
+            DIR_SIZE=$(( ${DU_DIR_SIZE} + ${DIR_NUM} * 4096 ))
             IMG_SIZE=$(( ${DIR_SIZE} / (1 - ${FAT_TAB_NUM} * ${FAT32_ITEM_SIZE} / ${CLT_SIZE}) + ${RESV_CNT} * ${BLK_SIZE}))
             if [ ${IMG_SIZE} -le ${IMG_MIN_SIZE} ]; then
                 IMG_SIZE=${IMG_MIN_SIZE}