Diff for /elwix/build_tools.sh between versions 1.6.6.3 and 1.7.2.5

version 1.6.6.3, 2014/01/15 09:09:44 version 1.7.2.5, 2017/01/19 00:31:39
Line 16  if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then Line 16  if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
         exit 1          exit 1
 fi  fi
 V=${VERSION}  V=${VERSION}
[ -r ${CENV} ] && . ${CENV}#[ -r ${CENV} ] && . ${CENV}
 unset INSTALL  unset INSTALL
 unset VERSION  unset VERSION
 VERSION="$V"  VERSION="$V"
   
 # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!  # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
X_TARGET_CPUTYPE="${TARGET_CPUTYPE}"X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
   
 if [ ! -d $BSDSRC ]; then  if [ ! -d $BSDSRC ]; then
         echo          echo
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 ..."
   
           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}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${ELWIX_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
        cd $CROSS_ELWIX        cd $CROSS_AITSCHED
        ${ELWIX_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITSCHED_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITIO          cd $CROSS_AITIO
        ${AITIO_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITIO_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITCFG          cd $CROSS_AITCFG
        ${AITCFG_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITCFG_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${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}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITRPC_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITWWW          cd $CROSS_AITWWW
        ${AITWWW_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITWWW_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITPELCO          cd $CROSS_AITPELCO
        ${AITPELCO_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITPELCO_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITSYNC          cd $CROSS_AITSYNC
        ${AITSYNC_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITSYNC_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITCLI          cd $CROSS_AITCLI
        ${AITCLI_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITCLI_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_AITMQTT          cd $CROSS_AITMQTT
        ${AITMQTT_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${AITMQTT_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_EMBEDTOOLS          cd $CROSS_EMBEDTOOLS
        ${EMBEDTOOLS_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${EMBEDTOOLS_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_ANSH          cd $CROSS_ANSH
        ${ANSH_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${ANSH_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_MQTT          cd $CROSS_MQTT
        ${MQTT_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${MQTT_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
         cd $CROSS_WIFINATOR          cd $CROSS_WIFINATOR
        ${WIFINATOR_CFG}        ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${WIFINATOR_CFG}
         ${CBUILD} clean          ${CBUILD} clean
         ${CBUILD}          ${CBUILD}
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
           cd $CROSS_TFTPD
           ${CEXEC} INSTALL=`echo "/bin/$INSTALL"` ${TFTPD_CFG}
           ${CBUILD} clean
           ${CBUILD}
           ${CBUILD} install
           cd -
 }  }
   
 install_tools()  install_tools()
Line 325  install_tools() Line 288  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 306  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()
if ! SnitVer ${WORLD}/elwix/elwix.ver; thenif [ "${COMPILE_DEPTOOLS}" = "YES" ]; then
         compile_deps || exit 1          compile_deps || exit 1
   fi
   
   #if ! SnitVer ${WORLD}/elwix/elwix.ver; then
 #       clean_bootstrap  #       clean_bootstrap
 #       compile_bootstrap || exit 1  #       compile_bootstrap || exit 1
   #
   #       echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
   #else
   #       echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
   #fi
   
         echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver  
 else  
         echo "Skipped ELWIX bootstrap pkgsrc tools build ..."  
 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_files        compile_fbsdtools || exit 1
        compile_tools        compile_files || exit 1
        build_tools        compile_tools || exit 1
 
         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.3  
changed lines
  Added in v.1.7.2.5


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