Diff for /elwix/build_3thparty.sh between versions 1.4.2.2 and 1.6.2.3

version 1.4.2.2, 2014/01/07 09:26:42 version 1.6.2.3, 2017/10/08 10:23:40
Line 9 Line 9
 #  #
   
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix  [ -r ./config/rc.elwix ] && . ./config/rc.elwix
if [ -r ./config/rc.3thparty_helper ]; thenif [ ! -r ./config/rc.3thparty_helper ]; then
        . ./config/rc.3thparty_helper 
else 
         echo          echo
         echo "ELWIX project is not configured - Missing rc.3thparty_helper script"          echo "ELWIX project is not configured - Missing rc.3thparty_helper script"
         echo          echo
Line 46  fi Line 44  fi
   
 clean_3th()  clean_3th()
 {  {
        echo "+++ Clean ELWIX 3th party ..."        echo "+++ Clean ELWIX 3th party ... ${PKG}, ${ROMFS_USR2}"
   
         rm -rf ${PKG} ${ROMFS_USR2}          rm -rf ${PKG} ${ROMFS_USR2}
   
Line 73  compile_3th() Line 71  compile_3th()
   
         BUILD_SH="./config/rc.3thparty_helper"          BUILD_SH="./config/rc.3thparty_helper"
   
        cd $CROSS_3TH#        ${BUILD_SH} expat ${CBUILD} ${PKG} ${TARGET_BUILD}
        ${BUILD_SH} expat ${CBUILD} ${PKG} ${TARGET_BUILD}#       [ $? -ne 0 ] && exit 1
 #       ${BUILD_SH} libevent ${CBUILD} ${PKG} ${TARGET_BUILD}
 #       [ $? -ne 0 ] && exit 1
 #       ${BUILD_SH} libiconv ${CGBUILD} ${PKG} ${TARGET_BUILD}
 #       [ $? -ne 0 ] && exit 1
 #       ${BUILD_SH} pcre ${CBUILD} ${PKG} ${TARGET_BUILD}
 #       [ $? -ne 0 ] && exit 1
 
         ${BUILD_SH} mini_sendmail ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh libevent ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} choparp ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh libiconv ${CGBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} libnet ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh pcre ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} arping ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh mini_sendmail ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} ipguard ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh choparp ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} igmpproxy ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1 
        ./build.sh scan_ffs ${CBUILD} ${PKG} ${TARGET_BUILD} 
        [ $? -ne 0 ] && exit 1 
#       ./build.sh istgt ${CBUILD} ${PKG} ${TARGET_BUILD} 
 #       [ $? -ne 0 ] && exit 1  #       [ $? -ne 0 ] && exit 1
        ./build.sh rsync ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} ttcp ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh ttcp ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} mtr ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh mpd ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} rsync ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh mrouted ${CGBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} iperf ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh igmpproxy ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} mpd ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh sudo ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} dnsmasq ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh bmon ${CGBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} confuse ${CGBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh mtr ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} bmon ${CGBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh ipguard ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} hping2 ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh smartmontools ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} pimd ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh quagga ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} pimdd ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh iftop ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} freevrrpd ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh arping ${CBUILD} ${PKG} ${TARGET_BUILD}        ${BUILD_SH} readline ${CGBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh hping2 ${CGBUILD} ${PKG} ${TARGET_BUILD}        env CFLAGS="-I${PKG}/include" LDFLAGS="-L${PKG}/lib" ${BUILD_SH} bird ${CGBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh trafshow ${CBUILD} ${PKG} ${TARGET_BUILD}        env CFLAGS="-I${PKG}/include" LDFLAGS="-L${PKG}/lib" ${BUILD_SH} bird6 ${CGBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
        ./build.sh ipsec-tools ${CBUILD} ${PKG} ${TARGET_BUILD}        env CFLAGS="-I${PKG}/include" LDFLAGS="-L${PKG}/lib" ${BUILD_SH} quagga ${CBUILD} ${PKG} ${TARGET_BUILD}
         [ $? -ne 0 ] && exit 1          [ $? -ne 0 ] && exit 1
#       ./build.sh dhcp ${CBUILD} ${PKG} ${TARGET_BUILD}
 
 #       ${BUILD_SH} iftop ${CBUILD} ${PKG} ${TARGET_BUILD}
 #       [ $? -ne 0 ] && exit 1  #       [ $? -ne 0 ] && exit 1
#       ./build.sh dhcping ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} sudo ${CBUILD} ${PKG} ${TARGET_BUILD}
 #       [ $? -ne 0 ] && exit 1  #       [ $? -ne 0 ] && exit 1
        ./build.sh dnsmasq ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} smartmontools ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#        [ $? -ne 0 ] && exit 1
        ./build.sh miniupnpd ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} trafshow ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#       [ $? -ne 0 ] && exit 1
        ./build.sh miniupnpc ${CGBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} ipsec-tools ${CGBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#       [ $? -ne 0 ] && exit 1
        ./build.sh ntp ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} dhcp ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#       [ $? -ne 0 ] && exit 1
        ./build.sh spawn-fcgi ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} dhcping ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#       [ $? -ne 0 ] && exit 1
        ./build.sh lighttpd ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} miniupnpd ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#        [ $? -ne 0 ] && exit 1
        ./build.sh libxml2 ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} miniupnpc ${CGBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#        [ $? -ne 0 ] && exit 1
        ./build.sh php ${CBUILD} ${PKG} ${TARGET_BUILD}#       ${BUILD_SH} ntp ${CBUILD} ${PKG} ${TARGET_BUILD}
        [ $? -ne 0 ] && exit 1#        [ $? -ne 0 ] && exit 1
        cd -#       ${BUILD_SH} spawn-fcgi ${CBUILD} ${PKG} ${TARGET_BUILD}
 #        [ $? -ne 0 ] && exit 1
 #       ${BUILD_SH} lighttpd ${CBUILD} ${PKG} ${TARGET_BUILD}
 #        [ $? -ne 0 ] && exit 1
 #       ${BUILD_SH} libxml2 ${CBUILD} ${PKG} ${TARGET_BUILD}
 #        [ $? -ne 0 ] && exit 1
 #       ${BUILD_SH} php ${CBUILD} ${PKG} ${TARGET_BUILD}
 #        [ $? -ne 0 ] && exit 1
         echo
 }  }
   
 install_3th()  install_3th()
Line 153  install_3th() Line 165  install_3th()
         SBIN="${ROMFS_USR2}/sbin"          SBIN="${ROMFS_USR2}/sbin"
         ETC="${ROMFS_USR2}/etc"          ETC="${ROMFS_USR2}/etc"
   
        echo "+++ Install ELWIX RomFS secondary firmware ..."        echo "+++ Install ELWIX RomFS secondary firmware ... ${ROMFS_USR2}"
   
         StripFiles \*.so\* ${PKG}/lib          StripFiles \*.so\* ${PKG}/lib
         InstallFiles \*.so\* ${PKG}/lib $LIBS          InstallFiles \*.so\* ${PKG}/lib $LIBS
Line 171  install_3th() Line 183  install_3th()
   
 build_3th()  build_3th()
 {  {
        echo "+++ Build ELWIX Firmware secondary image ..."        echo "+++ Build ELWIX Firmware secondary image ... ${ROMFS_USR2} --> ${REL}/${ROMFS_IMG2}"
   
         cd ${ROMFS_USR2}          cd ${ROMFS_USR2}
         pax -w -z -v -f${REL}/${ROMFS_IMG2} .          pax -w -z -v -f${REL}/${ROMFS_IMG2} .
Line 187  build_3th() Line 199  build_3th()
   
 #       mkuzip -s 8192 -o ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2};  #       mkuzip -s 8192 -o ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2};
 #       mv ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2}  #       mv ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2}
   
           echo "+++ Complited ELWIX Firmware secondary image ... ${REL}/${ROMFS_IMG2}"
 }  }
   
 ### main()  ### main()
   if [ -n "${1}" ]; then
           rm ${PKG}/elwix.ver
   fi
   
 if ! SnitVer ${PKG}/elwix.ver; then  if ! SnitVer ${PKG}/elwix.ver; then
        clean_3th        clean_3th || exit 1
        compile_3th        compile_3th || exit 1
   
        install_3th        install_3th || exit 1
        build_3th        build_3th || exit 1
   
         echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${PKG}/elwix.ver          echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${PKG}/elwix.ver
 else  else

Removed from v.1.4.2.2  
changed lines
  Added in v.1.6.2.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>