From f7a146878596312f233d4866732e05e68108daf3 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 29 Dec 2021 15:02:49 +0800
Subject: [PATCH] update build.sh, add firmware in rootfs

---
 bsp/images/build.sh |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/bsp/images/build.sh b/bsp/images/build.sh
index e8b2a0a..db1acbe 100755
--- a/bsp/images/build.sh
+++ b/bsp/images/build.sh
@@ -20,20 +20,22 @@
 PRJ_PATH=`pwd`
 PRJ_NAME=`basename ${PRJ_PATH}`
 
-IMAGE_PATH=${PRJ_PATH}/boot/
+# update by top build.sh
+BOARD=igkboard
+BSP_BRANCH=lf-5.10.52-2.1.0
+SYSTEM=buildroot
+DISTRO=2021.02
+SYSNAME=buildroot
 
-BOARD=imx6ull
+ROOTFS_DIR=rootfs_${SYSNAME}
 
-# rootfs should be buildroot or stretch/buster/bullseye for debian system
-ROOTFS=buster
-
-# linux kernel tarball path and branch
 TAR_PATH=${PRJ_PATH}/../tarball
+IMAGE_PATH=${PRJ_PATH}/boot/
 
 BOOT=emmc
 
-IMAGE_NAME=linuxsys_${BOARD}_${ROOTFS}.img
-if [ $ROOTFS == buildroot ] ; then
+IMAGE_NAME=linuxsys_${BOARD}_${SYSNAME}.img
+if [ $SYSTEM == buildroot ] ; then
     IMAGE_SIZE=512
 else
     IMAGE_SIZE=2048
@@ -50,10 +52,10 @@
 BOOT_SIZE=100
 
 
-IMG_UBOOT=${PRJ_PATH}/u-boot-imx6ull-emmc.imx
+IMG_UBOOT=${PRJ_PATH}/u-boot-${BOARD}.imx
 IMG_KERNEL=${IMAGE_PATH}/zImage
-IMG_DTB=${IMAGE_PATH}/imx6ull-emmc.dtb
-ROOTFS_TAR=${TAR_PATH}/rootfs_${ROOTFS}.tar.bz2
+IMG_DTB=${IMAGE_PATH}/${BOARD}-emmc.dtb
+ROOTFS_TAR=${PRJ_PATH}/../rootfs/${ROOTFS_DIR}.tar.bz2
 
 MNT_POINT=./mnt
 LOOP_DEV=`losetup  -f | cut -d/ -f3`
@@ -66,19 +68,24 @@
     echo "Shell script exit now, do some clean work"
     echo ""
 
+    set +e
+
     mountpoint $MNT_POINT > /dev/null 2>&1
     if [ $? == 0 ] ; then
+        echo "umount ${MNT_POINT}"
         umount ${MNT_POINT}
     fi
 
     rm -rf ${MNT_POINT}
 
     if [ -L /dev/mapper/${LOOP_DEV}p1 ] ; then
+        echo "kpartx -dv /dev/${LOOP_DEV}"
         kpartx -dv /dev/${LOOP_DEV}
     fi
 
     losetup -a | grep "${LOOP_DEV}" > /dev/null 2>&1
     if [ $? == 0 ]  ; then
+        echo "losetup -d /dev/${LOOP_DEV}"
         losetup -d /dev/${LOOP_DEV}
     fi
 }
@@ -160,6 +167,7 @@
 
     mount -t ext4 /dev/mapper/${LOOP_DEV}p2 ${MNT_POINT}
     tar -xjf ${ROOTFS_TAR} -C ${MNT_POINT} && sync
+    chown -R root.root ${MNT_POINT} && sync
 
     umount ${MNT_POINT}
 }
@@ -188,13 +196,13 @@
     install_rootfs
 
     msg_banner " bzip2 compress system image "
+    rm -f ${IMAGE_NAME}*.bz2
     bzip2 ${IMAGE_NAME}
 
     rm -rf ${MNT_POINT}
 
     printf "\n\n -- generate system image done --\n\n"
 }
-
 
 function do_root()
 {
@@ -246,4 +254,4 @@
 
 do_root "yes"
 do_image
-
+exit;

--
Gitblit v1.9.1