From cdec77818bad5d64e1e3656645f49261f2cc3501 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 11 Aug 2019 12:52:35 +0800
Subject: [PATCH] update 3rdparty build shell script

---
 3rdparty/openssh/build.sh  |    2 
 3rdparty/dhcpd/build.sh    |    4 +-
 3rdparty/ffmpeg/build.sh   |    4 -
 3rdparty/dropbear/build.sh |    2 
 3rdparty/opencv/build.sh   |   71 +++++++++++++++++++++++++++++------
 3rdparty/qt/build_QT5.sh   |    2 
 6 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/3rdparty/dhcpd/build.sh b/3rdparty/dhcpd/build.sh
index a5d8ea6..0af81a5 100755
--- a/3rdparty/dhcpd/build.sh
+++ b/3rdparty/dhcpd/build.sh
@@ -84,8 +84,8 @@
     check_result "ERROR: compile ${SRC_NAME} failure"
 
     ${STRIP} server/${IMG_NAME}
-    cp server/${IMG_NAME} ${PREFIX_PATH} ../
-    cp client/dhclient  ${PREFIX_PATH} ../
+    cp server/${IMG_NAME} ${PREFIX_PATH} 
+    cp client/dhclient  ${PREFIX_PATH} 
 
     cd -
 }
diff --git a/3rdparty/dropbear/build.sh b/3rdparty/dropbear/build.sh
index 6ceaebc..4707aaa 100755
--- a/3rdparty/dropbear/build.sh
+++ b/3rdparty/dropbear/build.sh
@@ -70,7 +70,7 @@
     SRC_NAME=dropbear-2019.78
     PACK_SUFIX=tar.bz2
 
-    if [ -f ${PREFIX_PATH}/dropbear ] ; then
+    if [ -f ${PREFIX_PATH}/bin/dropbear ] ; then
         return 0;
     fi
 
diff --git a/3rdparty/ffmpeg/build.sh b/3rdparty/ffmpeg/build.sh
index 6914cec..a7de813 100755
--- a/3rdparty/ffmpeg/build.sh
+++ b/3rdparty/ffmpeg/build.sh
@@ -83,9 +83,7 @@
     check_result "ERROR: compile ${SRC_NAME} failure"
 
     ${STRIP} ${IMG_NAME}
-    #${STRIP} ffserver
-    #cp ${IMG_NAME} ${PREFIX_PATH}
-    #cp ffserver ${PREFIX_PATH}
+    cp ${IMG_NAME} ${PREFIX_PATH}
 
     cd -
 }
diff --git a/3rdparty/opencv/build.sh b/3rdparty/opencv/build.sh
index ee25270..7b28789 100755
--- a/3rdparty/opencv/build.sh
+++ b/3rdparty/opencv/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-OPENCV_SRC=opencv-3.4.6
+PREFIX_PATH=`pwd`/../install/
 
 LYFTP_SRC=ftp://master.iot-yun.club/src/
 
@@ -12,18 +12,53 @@
 
 JOBS=`cat /proc/cpuinfo  |  grep processor | wc -l`
 
-if [ ! -d $OPENCV_SRC ] ; then
-    if [ ! -f $OPENCV_SRC.zip ] ; then
-        wget $LYFTP_SRC/$OPENCV_SRC.zip
+function msg_banner()
+{
+    echo ""
+    echo "+-----------------------------------------------------------------------"
+    echo "|  $1 " 
+    echo "+-----------------------------------------------------------------------"
+    echo ""
+}
+
+function check_result()
+{
+    if [ $? != 0 ] ; then
+       echo ""
+       echo "+-----------------------------------------------------------------------"
+       echo "|  $1 "
+       echo "+-----------------------------------------------------------------------"
+       echo ""
+       exit ;
+    fi
+}
+
+
+function compile_opencv()
+{
+    SRC_NAME=opencv-3.4.6
+    PACK_SUFIX=zip
+
+    if [ -f ${PREFIX_PATH}/lib/libopencv_core.so ] ; then
+        msg_banner "$SRC_NAME already compile and installed"
+#        return 0;
     fi
 
-    unzip $OPENCV_SRC.zip
-fi
+    msg_banner "Start cross compile $SRC_NAME "
 
-cd $OPENCV_SRC
 
-rm -f platforms/linux/${TOOLCHAIN} 
-cat >platforms/linux/${TOOLCHAIN} <<EOF
+    if [ ! -d $SRC_NAME ] ; then 
+        if [ ! -f $SRC_NAME.zip ] ; then 
+            wget $LYFTP_SRC/$SRC_NAME.${PACK_SUFIX}
+        fi
+
+        unzip $SRC_NAME.${PACK_SUFIX}
+    fi
+
+    cd $SRC_NAME
+
+    rm -f platforms/linux/${TOOLCHAIN} 
+    cat >platforms/linux/${TOOLCHAIN} <<EOF
 
 set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
 set(GNU_MACHINE "${CROSSTOOL%*-}" CACHE STRING "GNU compiler triple")
@@ -31,9 +66,19 @@
 
 EOF
 
-mkdir -p release
-cd release
+    mkdir -p release
+    cd release
 
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`pwd`/../../../install -DCMAKE_TOOLCHAIN_FILE="../platforms/linux/${TOOLCHAIN}" -DSOFTFP=ON -DENABLE_PROFILING=OFF -DWITH_OPENCL=OFF -DWITH_TBB=ON  -DWITH_V4L=ON -DHAVE_CAMV4L2=ON -DBUILD_TESTS=OFF -DINSTALL_PYTHON_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF -DWITH_FFMPEG=ON -DHAVE_FFMPEG=ON -DBUILD_opencv_js=OFF -DENABLE_NEON=OFF -DENABLE_VFPV3=OFF ../
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`pwd`/../../../install \
+        -DCMAKE_TOOLCHAIN_FILE="../platforms/linux/${TOOLCHAIN}" -DSOFTFP=ON -DENABLE_PROFILING=OFF \
+        -DWITH_OPENCL=OFF -DWITH_TBB=ON  -DWITH_V4L=ON -DHAVE_CAMV4L2=ON -DBUILD_TESTS=OFF \
+        -DINSTALL_PYTHON_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF -DWITH_FFMPEG=ON -DHAVE_FFMPEG=ON \
+        -DBUILD_opencv_js=OFF -DENABLE_NEON=OFF -DENABLE_VFPV3=OFF ../
 
-make && make install
+    make && make install
+
+    cd -
+}
+
+compile_opencv
+
diff --git a/3rdparty/openssh/build.sh b/3rdparty/openssh/build.sh
index a2387cb..43a546a 100755
--- a/3rdparty/openssh/build.sh
+++ b/3rdparty/openssh/build.sh
@@ -71,7 +71,7 @@
     SRC_NAME=openssh-8.0p1
     PACK_SUFIX=tar.gz
 
-    if [ -f ${PREFIX_PATH}/bin/openssh ] ; then
+    if [ -f ${PREFIX_PATH}/sbin/sshd ] ; then
         return 0;
     fi
 
diff --git a/3rdparty/qt/build_QT5.sh b/3rdparty/qt/build_QT5.sh
index e25d7b7..05cb528 100755
--- a/3rdparty/qt/build_QT5.sh
+++ b/3rdparty/qt/build_QT5.sh
@@ -16,7 +16,7 @@
 PRJ_PATH=`pwd`
 LIBS_PATH=$PRJ_PATH/../install
 
-QT_INST_PATH=/apps/QT5.9_A8
+QT_INST_PATH=/apps/QT5.9_A5
 
 LYFTP_SRC=ftp://master.iot-yun.club/src/
 

--
Gitblit v1.9.1