From f8f05031c8278c8ad6dd18714c2a82d930dbfcbd Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 24 Aug 2019 19:18:05 +0800
Subject: [PATCH] update setup_env shell script, fix set -e bug
---
tools/setup_env.sh | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/setup_env.sh b/tools/setup_env.sh
index 8e1df3f..f3b1dd7 100755
--- a/tools/setup_env.sh
+++ b/tools/setup_env.sh
@@ -7,8 +7,6 @@
LYFTP_PUB=ftp://master.iot-yun.club/pub/
-set -e
-
function sudo_banner()
{
if [ `id -u` != 0 ] ; then
@@ -29,6 +27,7 @@
function prepare_instpath()
{
if [ -w /apps -a -w /opt ] ; then
+ msg_banner "Install path [/apps and /opt] already setup, skip it"
return ;
fi
@@ -47,17 +46,19 @@
{
mkimage -V > /dev/null 2>&1
if [ $? == 0 ] ; then
+ msg_banner "All development system tools already installed, skip it"
return 0;
fi
+
+ msg_banner "start apt-get install system devlopment tools(commands)"
systools="gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat \
libsdl1.2-dev xterm sed cvs subversion coreutils texi2html docbook-utils python-pysqlite2 \
help2man make gcc g++ desktop-file-utils libgl1-mesa-dev libglu1-mesa-dev mercurial autoconf \
automake groff curl lzop asciidoc lib32z1 lib32ncurses5"
- devtools="u-boot-tools mtd-utils "
+ devtools="u-boot-tools mtd-utils device-tree-compiler"
- msg_banner "start apt-get install system devlopment tools(commands)"
sudo_banner
@@ -102,7 +103,7 @@
BUILDROOT_DLADDR=${LYFTP_PUB}/$BUILDROOT_TAR
if [ -d ${BUILDROOT_PATH}/${BUILDROOT_NAME} ] ; then
- LDROOTmsg_banner "$BUILDROOT_VER already installed to $BUILDROOT_PATH/$BUILDROOT_NAME"
+ msg_banner "$BUILDROOT_VER already installed to $BUILDROOT_PATH/$BUILDROOT_NAME"
return 0;
fi
@@ -122,8 +123,6 @@
prepare_instpath
install_systools
-
-#install_crosstool
install_buildroot
--
Gitblit v1.9.1