Diff for /elwix/build_tools.sh between versions 1.6.6.6 and 1.8.2.4

version 1.6.6.6, 2014/01/20 00:04:35 version 1.8.2.4, 2017/10/31 15:06:56
Line 40  fi Line 40  fi
   
 clean_tools()  clean_tools()
 {  {
        echo "+++ Clean ELWIX FreeBSD tools ..."        echo "+++ Clean ELWIX FreeBSD tools ... ${WORLD}/usr/local"
   
         rm -rf ${WORLD}/usr/local          rm -rf ${WORLD}/usr/local
         install -d ${WORLD}/usr/local          install -d ${WORLD}/usr/local
Line 120  compile_fbsdtools() Line 120  compile_fbsdtools()
 {  {
         echo "+++ Compile ELWIX FreeBSD tools ..."          echo "+++ Compile ELWIX FreeBSD tools ..."
   
        cd $CROSS_FT_VIMAGE        if [ "$(uname -m)" != ${TARGET} ]; then
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \                BSDSTATDIR="${BSDOBJ}/${TARGET}.${TARGET_ARCH}${BSDSRC}/lib/libbsdstat"
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean        else
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \                BSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}        fi
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
        cd - 
   
         cd $CROSS_FT_ATH          cd $CROSS_FT_ATH
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean#       cp ${CROSSTOOLDIR}/usr/include/private/bsdstat/bsdstat.h ${BSDTOOLS}/ath/common || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}" || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}        ${CBUILD} DESTDIR=${WORLD} install || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
         cd -          cd -
   
        cd $CROSS_FT_IPW        cd $CROSS_FT_CXGB
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean        ${CBUILD} DESTDIR=${WORLD} || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD}/usr/local/bin BINDIR="" install || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install 
         cd -          cd -
   
        cd $CROSS_FT_IWI        cd $CROSS_FT_IFINFO
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean        ${CBUILD} DESTDIR=${WORLD} || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD}/usr/local/bin BINDIR="" install || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install 
         cd -          cd -
   
        cd $CROSS_FT_MWL        cd $CROSS_FT_MCTEST
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean        ${CBUILD} DESTDIR=${WORLD} MK_MAN="no" || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD}/usr/local/bin MK_MAN="no" BINDIR="" install || exit 1
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
         cd -          cd -
   
#       cd $CROSS_FT_NET80211#       cd $CROSS_FT_NETMAP
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \#       ${CBUILD} DESTDIR=${WORLD} clean || exit 1
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean#       ${CBUILD} DESTDIR=${WORLD} || exit 1
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \#       ${CBUILD} DESTDIR=${WORLD}/usr/local/bin BINDIR="" install || exit 1
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} 
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
 #       cd -  #       cd -
   
#        cd $CROSS_FT_WTAP        cd $CROSS_FT_NETBLAST
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean        ${CBUILD} DESTDIR=${WORLD} || exit 1
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD}/usr/local/bin BINDIR="" install || exit 1
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}        cd -
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install        cd $CROSS_FT_NETRCV
#        cd -        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
         ${CBUILD} DESTDIR=${WORLD} || exit 1
         ${CBUILD} DESTDIR=${WORLD}/usr/local/bin BINDIR="" install || exit 1
         cd -
 
         cd $CROSS_FT_NETSND
         ${CBUILD} DESTDIR=${WORLD} clean || exit 1
         ${CBUILD} DESTDIR=${WORLD} || exit 1
         ${CBUILD} DESTDIR=${WORLD}/usr/local/bin BINDIR="" install || exit 1
         cd -
 }  }
   
 compile_files()  compile_files()
 {  {
         cd files          cd files
        env MAKEOBJDIRPREFIX=${BSDOBJ} make \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \        ${CBUILD} DESTDIR=${WORLD} obj || exit 1
                __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean        ${CBUILD} DESTDIR=${WORLD} depend || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make \        ${CBUILD} DESTDIR=${WORLD} || exit 1
                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \        ${CBUILD} DESTDIR=${WORLD} install || exit 1
                __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} obj 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make \ 
                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ 
                __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} depend  
        env MAKEOBJDIRPREFIX=${BSDOBJ} make \ 
                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ 
                __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make \ 
                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ 
                __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install  
         cd -          cd -
   
         strip -s ${WORLD}/usr/bin/csh  
 }  }
   
compile_tools()compile_sw()
 {  {
        echo "+++ Compile ELWIX Cross ..."        CROSS_OPTS=$(eval echo "\$$2_OPTS")
   
        cd $CROSS_AXL        cd $1$2
        ${AXL_CFG}        ${CEXEC} INSTALL="/usr/bin/install" ./configure $CROSS_OPTS ${CROSS_PFX}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   }
   
        cd $CROSS_ELWIXcompile_tools()
        ${ELWIX_CFG}{
        ${CBUILD} clean        echo "+++ Compile ELWIX Cross ..."
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
   
        cd $CROSS_AITIO        for i in ${CROSS_TOOLS}; do
        ${AITIO_CFG}                if [ -d "${CROSS_PATH}$i" ]; then
        ${CBUILD} clean                        compile_sw ${CROSS_PATH} $i
        ${CBUILD}                else
        ${CBUILD} install                        Die "Error:: ${CROSS_PATH}$i not found!"
        cd -                fi
        done
        cd $CROSS_AITCFG 
        ${AITCFG_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITSCHED 
        ${AITSCHED_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITRPC 
        ${AITRPC_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITWWW 
        ${AITWWW_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITPELCO 
        ${AITPELCO_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITSYNC 
        ${AITSYNC_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITCLI 
        ${AITCLI_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_AITMQTT 
        ${AITMQTT_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_EMBEDTOOLS 
        ${EMBEDTOOLS_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_ANSH 
        ${ANSH_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_MQTT 
        ${MQTT_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 
        cd $CROSS_WIFINATOR 
        ${WIFINATOR_CFG} 
        ${CBUILD} clean 
        ${CBUILD} 
        ${CBUILD} install 
        cd - 
 }  }
   
 install_tools()  install_tools()
Line 325  install_tools() Line 220  install_tools()
         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 343  install_tools() Line 238  install_tools()
   
 build_tools()  build_tools()
 {  {
        echo "+++ Build ELWIX core firmware image ..."        echo "+++ Build ELWIX core firmware image ... ${WORLD}/usr/local --> ${REL}/${LOCALFS_IMG}"
   
         cd ${WORLD}/usr/local          cd ${WORLD}/usr/local
           find . -name ".debug" -exec rm -rf {} \;
         pax -w -z -v -f${REL}/${LOCALFS_IMG} .          pax -w -z -v -f${REL}/${LOCALFS_IMG} .
         cd -          cd -
   
           echo "+++ Completed ELWIX core firmware image ... ${REL}/${LOCALFS_IMG}"
 }  }
   
 ### main()  ### main()
compile_deps || exit 1if [ -n "${1}" ]; then
         rm ${WORLD}/usr/local/elwix.ver
 fi
   
   if [ "${COMPILE_DEPTOOLS}" = "YES" ]; then
           compile_deps || exit 1
   fi
   
 #if ! SnitVer ${WORLD}/elwix/elwix.ver; then  #if ! SnitVer ${WORLD}/elwix/elwix.ver; then
 #       clean_bootstrap  #       clean_bootstrap
 #       compile_bootstrap || exit 1  #       compile_bootstrap || exit 1
Line 363  compile_deps || exit 1 Line 267  compile_deps || exit 1
 #fi  #fi
   
 if ! SnitVer ${WORLD}/usr/local/elwix.ver; then  if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
        clean_tools        clean_tools || exit 1
   
        compile_fbsdtools        compile_fbsdtools || exit 1
        compile_files        compile_files || exit 1
        compile_tools        compile_tools || exit 1
   
        build_tools        build_tools || exit 1
   
         echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver          echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
 else  else

Removed from v.1.6.6.6  
changed lines
  Added in v.1.8.2.4


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