From 26c06979cd0a2f143732faa48329b9d4e2236d24 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 24 Aug 2019 16:50:52 +0800
Subject: [PATCH] update setup_env.sh to fix import bug
---
3rdparty/appweb/build.sh | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/3rdparty/appweb/build.sh b/3rdparty/appweb/build.sh
index dc66641..3a91d6b 100755
--- a/3rdparty/appweb/build.sh
+++ b/3rdparty/appweb/build.sh
@@ -10,11 +10,15 @@
PRJ_PATH=`pwd`
PREFIX_PATH=`pwd`/appweb
+TFTP_PATH=/tftp
+
mkdir -p $PREFIX_PATH/{bin,modules}
-if [ -z $CROSSTOOL ] ; then
- CROSSTOOL=/opt/crosstool/cortex-a7/bin/arm-linux-gnueabi-
-fi
+LYFTP_SRC=ftp://master.iot-yun.club/src/
+
+CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
+
+TARBALL=appweb_cortexa5.tar.bz2
function msg_banner()
{
@@ -64,13 +68,15 @@
PACK_SUFIX=tar.bz2
if [ -f ${PREFIX_PATH}/modules/libphp5.so ] ; then
+ msg_banner "$SRC_NAME already compile and installed"
return 0;
fi
msg_banner "Start cross compile $SRC_NAME "
if [ ! -f ${SRC_NAME}.${PACK_SUFIX} ] ; then
- wget http://museum.php.net/php5/${SRC_NAME}.${PACK_SUFIX}
+ #wget http://museum.php.net/php5/${SRC_NAME}.${PACK_SUFIX}
+ wget $LYFTP_SRC/$SRC_NAME.$PACK_SUFIX
check_result "ERROR: download ${SRC_NAME} failure"
fi
@@ -113,13 +119,15 @@
PACK_SUFIX=-0-src.tgz
if [ -f ${PREFIX_PATH}/bin/appweb ] ; then
+ msg_banner "$SRC_NAME already compiled"
return 0;
fi
msg_banner "Start cross compile $SRC_NAME "
if [ ! -f ${SRC_NAME}${PACK_SUFIX} ] ; then
- wget https://embedthis.com/software/${SRC_NAME}${PACK_SUFIX}
+ #wget https://embedthis.com/software/${SRC_NAME}${PACK_SUFIX}
+ wget $LYFTP_SRC/${SRC_NAME}${PACK_SUFIX}
check_result "ERROR: download ${SRC_NAME} failure"
fi
@@ -145,9 +153,14 @@
function install_appweb()
{
- msg_banner "Start install webserver appweb "
-
cd ${PRJ_PATH}
+
+ if [ -f ${TARBALL} ] ; then
+ msg_banner "$SRC_NAME already installed"
+ return 0;
+ fi
+
+ msg_banner "Start install webserver appweb "
# install web page
rm -rf $PREFIX_PATH/web
@@ -170,8 +183,11 @@
chmod 755 run.sh
mv run.sh $PREFIX_PATH/
- tar -czf appweb_cortexa8.tar.gz `basename $PREFIX_PATH`
- ls -l appweb_cortexa8.tar.gz
+ tar -cjf ${TARBALL} `basename $PREFIX_PATH`
+
+ if [ -d $TFTP_PATH -a -w $TFTP_PATH ] ; then
+ cp ${TARBALL} $TFTP_PATH
+ fi
}
--
Gitblit v1.9.1