From bfceb172fbac401c760473a4ee7c159940253d9b Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Fri, 26 Nov 2021 21:43:31 +0800
Subject: [PATCH] remove space in the end of a line
---
bsp/rootfs/build.sh | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index ef8ec8a..c692d4c 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -36,12 +36,12 @@
STAGE=0
function msg_banner()
-{
+{
STAGE=`expr $STAGE + 1`
-
+
echo ""
- echo "+---------------------------------------------+"
- printf " Stage $STAGE: $1\n"
+ echo "+---------------------------------------------+"
+ printf " Stage $STAGE: $1\n"
echo "+---------------------------------------------+"
echo ""
}
@@ -50,12 +50,12 @@
{
if [ -d ${ROOTFS_DIR} ] ; then
printf "\n\n -- ${ROOTFS_DIR} fetched already, skip it -- \n\n"
- return;
+ return;
fi
- if [ -s ${TAR_PATH}/${ROOTFS_DIR}.tar.bz2 ] ; then
- printf "\n\n -- decompress ${ROOTFS_DIR}.tar.bz2 -- \n\n"
- mkdir -p ${ROOTFS_DIR}
+ if [ -s ${TAR_PATH}/${ROOTFS_DIR}.tar.bz2 ] ; then
+ printf "\n\n -- decompress ${ROOTFS_DIR}.tar.bz2 -- \n\n"
+ mkdir -p ${ROOTFS_DIR}
tar -xjf ${TAR_PATH}/${ROOTFS_DIR}.tar.bz2 -C ${ROOTFS_DIR}
fi
@@ -71,9 +71,9 @@
# try to decompress packet first.
do_unpack
- if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
- if [ ! -d ${ROOTFS_DIR} ] ; then
- echo " ERROR: miss rootfs ${ROOTFS}, exit now. "
+ if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
+ if [ ! -d ${ROOTFS_DIR} ] ; then
+ echo " ERROR: miss rootfs ${ROOTFS}, exit now. "
echo ""
exit;
else
@@ -85,27 +85,27 @@
export DEBCONF_NONINTERACTIVE_SEEN=true
export LC_ALL=C
export LANGUAGE=C
- export LANG=C
+ export LANG=C
- printf "\n\n -- debootstrap fetch start --\n\n"
+ printf "\n\n -- debootstrap fetch start --\n\n"
debootstrap --arch=${ARCH} --foreign ${ROOTFS} ${ROOTFS_DIR} http://ftp.cn.debian.org/debian/
- chroot ${ROOTFS_DIR} debootstrap/debootstrap --second-stage
- printf "\n\n -- debootstrap config start --\n\n"
+ chroot ${ROOTFS_DIR} debootstrap/debootstrap --second-stage
+ printf "\n\n -- debootstrap config start --\n\n"
- chroot ${ROOTFS_DIR} dpkg --configure -a
- printf "\n\n -- debootstrap fetch done -- \n\n"
+ chroot ${ROOTFS_DIR} dpkg --configure -a
+ printf "\n\n -- debootstrap fetch done -- \n\n"
# set root password
- chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd"
+ chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd"
# add extra user account
chroot ${ROOTFS_DIR} sh -c "useradd -m -G sudo -s /bin/bash ${DEF_USER}"
chroot ${ROOTFS_DIR} sh -c "echo ${DEF_USER}:${DEF_PASSWD} | chpasswd"
chroot ${ROOTFS_DIR} sh -c "usermod -G video,audio ${DEF_USER}"
- # Clear the MD5 value to install extra apps
- sed -i -e "s|.*md5val.*|\t\"md5val\":\"MD5_Auto_Generate_Here\"|g" $APT_CONF
+ # Clear the MD5 value to install extra apps
+ sed -i -e "s|.*md5val.*|\t\"md5val\":\"MD5_Auto_Generate_Here\"|g" $APT_CONF
}
# Install extra apps defined in extra_apps.conf
@@ -115,28 +115,28 @@
export DEBCONF_NONINTERACTIVE_SEEN=true
export LC_ALL=C
export LANGUAGE=C
- export LANG=C
+ export LANG=C
msg_banner " debootstrap apt install "
- if [ -f $APT_CONF ] ; then
+ if [ -f $APT_CONF ] ; then
extra_apps=$(eval jq -r .extra_apps[] $APT_CONF )
md5_file=$(eval jq -r .md5val extra_apps.json)
md5_calc=$(eval echo $extra_apps | md5sum | awk '{print $1}')
- if [ $md5_file == $md5_calc ] ; then
+ if [ $md5_file == $md5_calc ] ; then
printf "\n\n -- debootstrap apt install already, skip it! --\n\n"
else
printf "\n\n -- debootstrap apt install start --\n\n"
- cp -f /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
- mount -o bind /proc ${ROOTFS_DIR}/proc
- mount -o bind /dev ${ROOTFS_DIR}/dev
- mount -o bind /dev/pts ${ROOTFS_DIR}/dev/pts
+ cp -f /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
+ mount -o bind /proc ${ROOTFS_DIR}/proc
+ mount -o bind /dev ${ROOTFS_DIR}/dev
+ mount -o bind /dev/pts ${ROOTFS_DIR}/dev/pts
mount -o bind /sys ${ROOTFS_DIR}/sys
- chroot ${ROOTFS_DIR} apt update
+ chroot ${ROOTFS_DIR} apt update
chroot ${ROOTFS_DIR} apt install -y ${extra_apps}
umount ${ROOTFS_DIR}/{sys,proc,dev/pts,dev}
@@ -151,7 +151,7 @@
{
if [ ! -d ${DRV_PATH}/lib/modules ] ; then
return ;
- fi
+ fi
msg_banner " install kernel modules"
@@ -222,32 +222,32 @@
function do_rootfs()
{
- do_fetch
+ do_fetch
echo "do rootfs continue "
# debian rootfs need apt install packet
- if [ $ROOTFS != "buildroot" -a $ROOTFS != "yocto" ] ;then
- do_apt
+ if [ $ROOTFS != "buildroot" -a $ROOTFS != "yocto" ] ;then
+ do_apt
fi
- do_modules
- do_modify
+ do_modules
+ do_modify
do_pack
}
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()
@@ -266,22 +266,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_rootfs
--
Gitblit v1.9.1