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

version 1.6.6.6, 2014/01/20 00:04:35 version 1.7.2.3, 2016/09/29 14:38:29
Line 120  compile_fbsdtools() Line 120  compile_fbsdtools()
 {  {
         echo "+++ Compile ELWIX FreeBSD tools ..."          echo "+++ Compile ELWIX FreeBSD tools ..."
   
           if [ "$(uname -m)" != ${TARGET} ]; then
                   BSDSTATDIR="${BSDOBJ}/${TARGET}.${TARGET_ARCH}${BSDSRC}/lib/libbsdstat"
           else
                   BSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
           fi
   
         cd $CROSS_FT_VIMAGE          cd $CROSS_FT_VIMAGE
        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} 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_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_IPW
        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 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}/usr/local/bin install 
        cd - 
   
        cd $CROSS_FT_IWI#        cd $CROSS_FT_IWI
        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 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 $CROSS_FT_MWL 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean 
        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 $CROSS_FT_NET80211 
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
#               ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean 
#       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 -
   
#       cd $CROSS_FT_WTAP#       cd $CROSS_FT_MWL
#       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}/mwl/mwlstats || 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 -
 }  }
   
 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_tools()
 {  {
         echo "+++ Compile ELWIX Cross ..."          echo "+++ Compile ELWIX Cross ..."
   
        cd $CROSS_AXL        cd $CROSS_ELWIX
        ${AXL_CFG}        ${ELWIX_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
        cd $CROSS_ELWIX        cd $CROSS_AITSCHED
        ${ELWIX_CFG}        ${AITSCHED_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
Line 239  compile_tools() Line 202  compile_tools()
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITSCHED  
         ${AITSCHED_CFG}  
         ${CBUILD} clean  
         ${CBUILD}  
         ${CBUILD} install  
         cd -  
   
         cd $CROSS_AITRPC          cd $CROSS_AITRPC
         ${AITRPC_CFG}          ${AITRPC_CFG}
         ${CBUILD} clean          ${CBUILD} clean
Line 315  compile_tools() Line 271  compile_tools()
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
           cd $CROSS_TFTPD
           ${TFTPD_CFG}
           ${CBUILD} clean
           ${CBUILD}
           ${CBUILD} install
           cd -
 }  }
   
 install_tools()  install_tools()
Line 346  build_tools() Line 309  build_tools()
         echo "+++ Build ELWIX core firmware image ..."          echo "+++ Build ELWIX core firmware image ..."
   
         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 -
 }  }
   
 ### main()  ### main()
compile_deps || exit 1if [ "${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
Line 363  compile_deps || exit 1 Line 329  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.7.2.3


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