From 7c913043d12d30abe0b43ae777f00211c6680ba6 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 13 Dec 2021 09:39:53 +0800
Subject: [PATCH] Merge branch 'master' of ssh://master.iot-yun.club:2280/imx6ull
---
bsp/images/build.sh | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bsp/images/build.sh b/bsp/images/build.sh
index e8b2a0a..7000e39 100755
--- a/bsp/images/build.sh
+++ b/bsp/images/build.sh
@@ -25,7 +25,7 @@
BOARD=imx6ull
# rootfs should be buildroot or stretch/buster/bullseye for debian system
-ROOTFS=buster
+ROOTFS=buildroot
# linux kernel tarball path and branch
TAR_PATH=${PRJ_PATH}/../tarball
@@ -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
}
@@ -195,7 +200,6 @@
printf "\n\n -- generate system image done --\n\n"
}
-
function do_root()
{
echo ""
@@ -246,4 +250,4 @@
do_root "yes"
do_image
-
+exit;
--
Gitblit v1.9.1