optimize build scripts

Author: Neutree

tools/os/maixcam/gen_os.sh

@@ -117,7 +117,7 @@ echo "pack and copy MaixCDK projects"
 cd "$MAIXCDK_PATH/projects"
 if [ $skip_build_apps == 0 ]; then
     chmod +x ./build_all.sh
-    ./build_all.sh
+    ./build_all.sh maixcam
 fi
 cd -
 if [ -d $MAIXCDK_PATH/projects/apps/ ]; then

tools/os/maixcam2/gen_os.sh

@@ -15,10 +15,9 @@ set -x
 
 function usage() {
     echo "Usage:"
-    echo "      ./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> [skip_build_apps] [board_name] [rootfs_size] [delete_first_files]"
+    echo "      ./gen_os.sh <base_os_filepath> <maixpy_whl_filepath> <builtin_files_dir_path> [skip_build_apps] [board_name] [delete_first_files]"
     echo "skip_build_apps can be 0 or 1"
     echo "board_name can be maixcam or maixcam-pro"
-    echo "rootfs_size default AUTO means same with original, you can change it like 5120M"
     echo "delete_first_files before copy new builtin files, delete some files, one line one item, format same with command rm"
     echo ""
 }
@@ -58,13 +57,9 @@ if [ -n "$5" ]; then
     fi
 fi
 
-rootfs_size=AUTO
 delete_first_files=""
 if [ -n "$6" ]; then
-    rootfs_size=$6
-fi
-if [ -n "$7" ]; then
-    delete_first_files=$7
+    delete_first_files=$6
 fi
 
 
@@ -96,9 +91,12 @@ rm -rf tmp/maixpy_whl
 rm -rf tmp/sys_builtin_files
 rm -rf tmp/*.img
 rm -rf tmp/$os_version_str.img.xz
-rm tmp/delete_files.txt
+rm -rf tmp/delete_files.txt
 sync
 
+# get sudo permission for update_img.sh later
+sudo echo "Need sudo permission for update_img.sh later, grant permission now"
+
 # 1. 检查参数 文件或者文件夹是否存在，然后拷贝一份 builtin_files_dir_path 到 tmp，不要影响原目录，检查 base os file 是不是 xz, 如果是解压到临时目录 tmp，并改名为 os_version_str.img，不是则拷贝一份到 tmp 目录下 os_version_str.img
 echo "copy builtin files"
 
@@ -148,7 +146,7 @@ echo "pack and copy MaixCDK projects"
 cd "$MAIXCDK_PATH/projects"
 if [ $skip_build_apps == 0 ]; then
     chmod +x ./build_all.sh
-    ./build_all.sh
+    ./build_all.sh maixcam2
 fi
 cd -
 if [ -d $MAIXCDK_PATH/projects/apps/ ]; then
@@ -180,7 +178,7 @@ delete_first_files=tmp/delete_files.txt
 
 # 9. 拷贝 tmp/sys_builtin_files 生成新镜像，通过 ./update_img.sh tmp/sys_builtin_files tmp/os_version_str.img
 echo "Now update system image, need sudo permition to mount rootfs:"
-sudo ./update_img.sh $base_os_path tmp/sys_builtin_files $delete_first_files tmp/${os_version_str}.axp $rootfs_size
+sudo ./update_img.sh $base_os_path tmp/sys_builtin_files $delete_first_files tmp/${os_version_str}.axp
 
 mkdir -p images
 mv tmp/${os_version_str}.axp images/${os_version_str}.axp

tools/os/maixcam2/update_img.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ###
-#    update_image.sh <xxxx.axp> <builtin_files.tar.xz/builtin_files_dir> <delete_first_files.txt> <out_path> [rootfs_size]
+#    update_image.sh <xxxx.axp> <builtin_files.tar.xz/builtin_files_dir> <delete_first_files.txt> <out_path>
 ###
 
 set -e
@@ -13,11 +13,6 @@ out_path=$4
 
 rootfs_name=ubuntu_rootfs_sparse.ext4
 bootfs_name=bootfs.fat32
-rootfs_image_size=AUTO
-# if rootf_size is not set, use default value
-if [ -n "$5" ]; then
-    rootfs_image_size=$5
-fi
 
 # check root permition
 if [ "$(id -u)" -ne 0 ]; then
@@ -98,15 +93,6 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 echo "Converting $axp_file to raw image done"
-file_size=$(stat -c%s tmp2/rootfs.ext4.raw)
-rootfs_image_size0=$(($file_size / 1024 / 1024))M
-resize_image=0
-if [[ $rootfs_image_size == "AUTO" ]]; then
-    rootfs_image_size=$rootfs_image_size0
-elif [[ $rootfs_image_size0 != "$rootfs_image_size" ]]; then
-    echo "will create new image with size $rootfs_image_size"
-    resize_image=1
-fi
 
 echo "Mounting raw image to tmp2/rootfs"
 mkdir -p tmp2/rootfs
@@ -143,32 +129,45 @@ while IFS= read -r line; do
     fi
 done < "$delete_first_files"
 
+# check image size
+# get tmp2/rootfs + builtin_files size, if > rootfs_image_size, update rootfs_image_size -> rootfs_image_size + 100M
+rootfs_image_size0=$(du -s --block-size=1M tmp2/rootfs | cut -f1)
+rootfs_image_size0=$(($rootfs_image_size0 + $(du -s --block-size=1M $builtin_files | cut -f1)))
+rootfs_image_size=$(($rootfs_image_size0 + 300))
+echo "=============================="
+echo "rootfs_dir_size: $rootfs_image_size0 M"
+echo "final rootfs_image_size: $rootfs_image_size M"
+echo "=============================="
+
 # copy builtin_files rootfs
 echo "Copying files from directory $builtin_files"
 target_rootfs_path=tmp2/rootfs
-if [[ "$resize_image" == "1" ]]; then
-    mkdir tmp2/rootfs_new
-    cp -r tmp2/rootfs/* tmp2/rootfs_new/
-    target_rootfs_path=tmp2/rootfs_new
-fi
+# copy to new dir
+rm -rf tmp2/rootfs_new
+mkdir tmp2/rootfs_new
+cp -rP tmp2/rootfs/* tmp2/rootfs_new/
+target_rootfs_path=tmp2/rootfs_new
+# copy rootfs files
 find $builtin_files -mindepth 1 -maxdepth 1 -type d ! -name "boot" | while read -r dir; do
-    cp -r "$dir" "$target_rootfs_path"
+    cp -rP "$dir" "$target_rootfs_path"
 done
 
 # copy boot files
 if [[ -e ${builtin_files}/boot ]]; then
     echo "Copying boot files from ${builtin_files}/boot..."
     mkdir -p tmp2/bootfs
     mount -o loop,rw tmp2/axp/$bootfs_name tmp2/bootfs
-    cp -rf ${builtin_files}/boot/* tmp2/bootfs/
+    cp -rfP ${builtin_files}/boot/* tmp2/bootfs/
+    sync
     umount tmp2/bootfs
     echo "Copying boot files done"
 fi
 
 # convert raw image to ext4 sparse image
 echo "Making sparse rootfs ..."
 rm -f tmp2/axp/${rootfs_name}
-./make_ext4fs/make_ext4fs -s -l $rootfs_image_size tmp2/axp/${rootfs_name} $target_rootfs_path
+./make_ext4fs/make_ext4fs -s -l ${rootfs_image_size}M tmp2/axp/${rootfs_name} $target_rootfs_path
+sync
 echo "Making sparse rootfs done"
 
 # unmount rootfs