From 82d8bc96eaa5e551ff590c3f57fc247986b28024 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 16 Dec 2021 17:28:43 +0800 Subject: [PATCH] update boardname to igkboard --- bsp/images/build.sh | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/bsp/images/build.sh b/bsp/images/build.sh index b66b133..fbc678b 100755 --- a/bsp/images/build.sh +++ b/bsp/images/build.sh @@ -22,7 +22,7 @@ IMAGE_PATH=${PRJ_PATH}/boot/ -BOARD=imx6ull +BOARD=igkboard # rootfs should be buildroot or stretch/buster/bullseye for debian system ROOTFS=buildroot @@ -50,9 +50,9 @@ BOOT_SIZE=100 -IMG_UBOOT=${PRJ_PATH}/u-boot-imx6ull-emmc.imx +IMG_UBOOT=${PRJ_PATH}/u-boot-${BOARD}-emmc.imx IMG_KERNEL=${IMAGE_PATH}/zImage -IMG_DTB=${IMAGE_PATH}/imx6ull-emmc.dtb +IMG_DTB=${IMAGE_PATH}/${BOARD}-emmc.dtb ROOTFS_TAR=${TAR_PATH}/rootfs_${ROOTFS}.tar.bz2 MNT_POINT=./mnt @@ -66,19 +66,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 +165,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} } @@ -176,18 +182,19 @@ } function do_image() -{ - mkdir -p ${MNT_POINT} +{ + mkdir -p ${MNT_POINT} - generate_image + generate_image - format_partition + format_partition - install_sysimg + install_sysimg - install_rootfs + install_rootfs msg_banner " bzip2 compress system image " + rm -f ${IMAGE_NAME}*.bz2 bzip2 ${IMAGE_NAME} rm -rf ${MNT_POINT} @@ -195,19 +202,18 @@ printf "\n\n -- generate system image done --\n\n" } - function do_root() { echo "" - if [[ $1 == "yes" ]] && [ `id -u` != 0 ] ; then + if [[ $1 == "yes" ]] && [ `id -u` != 0 ] ; then echo "ERROR: This action must run as root!" echo "" exit; - elif [[ $1 != "yes" ]] && [ `id -u` == 0 ] ; then + elif [[ $1 != "yes" ]] && [ `id -u` == 0 ] ; then echo "ERROR: This action cannot run as root!" echo "" exit; - fi + fi } function do_usage() @@ -228,22 +234,22 @@ while getopts "bch" OPTNAME do - case "${OPTNAME}" in - "b") + case "${OPTNAME}" in + "b") break; - ;; + ;; - "c") + "c") do_root "yes" do_distclean - ;; + ;; "*") do_usage - ;; + ;; esac done -do_root "yes" +do_root "yes" do_image - +exit; -- Gitblit v1.9.1