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

version 1.5.4.3, 2013/05/22 15:29:14 version 1.7.2.3, 2016/09/29 14:38:29
Line 15  if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then Line 15  if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
         echo          echo
         exit 1          exit 1
 fi  fi
   V=${VERSION}
   #[ -r ${CENV} ] && . ${CENV}
   unset INSTALL
   unset VERSION
   VERSION="$V"
   
   # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
   X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
   
 if [ ! -d $BSDSRC ]; then  if [ ! -d $BSDSRC ]; then
         echo          echo
         echo "ELWIX project is not configured - missing BSD sources !?!"          echo "ELWIX project is not configured - missing BSD sources !?!"
Line 63  clean_bootstrap() Line 71  clean_bootstrap()
 compile_deps()  compile_deps()
 {  {
         echo "+++ Compile ELWIX programs bootstrap tools ..."          echo "+++ Compile ELWIX programs bootstrap tools ..."
        cd tools        if [ -d tools -a -f tools/Makefile ]; then
        make cleandepend                cd tools
        make clean                make cleandepend
        make obj                make clean
        make                make obj
        make install                make
        cd -                make install
                 cd -
         fi
 }  }
   
 compile_bootstrap()  compile_bootstrap()
Line 104  USE_NATIVE_GCC=  yes Line 114  USE_NATIVE_GCC=  yes
   
 .endif                  # end cross-compilation settings  .endif                  # end cross-compilation settings
 _EOF  _EOF
   
         echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver  
 }  }
   
 compile_fbsdtools()  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
                clean DESTDIR=${WORLD}        ${CBUILD} DESTDIR=${WORLD} || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \        ${CBUILD} DESTDIR=${WORLD} install || exit 1
                DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                install DESTDIR=${WORLD} 
         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
                clean DESTDIR=${WORLD}        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
                DESTDIR=${WORLD}        ${CBUILD} DESTDIR=${WORLD} install || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                install DESTDIR=${WORLD} 
         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
                clean DESTDIR=${WORLD}#       ${CBUILD} DESTDIR=${WORLD} || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \#       ${CBUILD} DESTDIR=${WORLD}/usr/local/bin install || exit 1
                DESTDIR=${WORLD}#        cd -
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                install DESTDIR=${WORLD}/usr/local/bin 
        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
                clean DESTDIR=${WORLD}#       ${CBUILD} DESTDIR=${WORLD} || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \#       ${CBUILD} DESTDIR=${WORLD}/usr/local/bin install || exit 1
                DESTDIR=${WORLD}#        cd -
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                install DESTDIR=${WORLD}/usr/local/bin 
        cd - 
   
        cd $CROSS_FT_MWL#        cd $CROSS_FT_MWL
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \#       ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                clean DESTDIR=${WORLD}#       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
                DESTDIR=${WORLD}#       ${CBUILD} DESTDIR=${WORLD} install || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                install DESTDIR=${WORLD} 
        cd - 
 
        cd $CROSS_FT_NET80211 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                clean DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
                install DESTDIR=${WORLD} 
        cd - 
 
#       cd $CROSS_FT_WTAP 
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
#               clean DESTDIR=${WORLD} 
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
#               DESTDIR=${WORLD} 
#       env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 
#                install DESTDIR=${WORLD} 
 #       cd -  #       cd -
 }  }
   
 compile_files()  compile_files()
 {  {
         cd files          cd files
        env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \        ${CBUILD} DESTDIR=${WORLD} clean || exit 1
                TARGET_ARCH=${TARGET_ARCH} clean DESTDIR=${WORLD}        ${CBUILD} DESTDIR=${WORLD} obj || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \        ${CBUILD} DESTDIR=${WORLD} depend || exit 1
                TARGET_ARCH=${TARGET_ARCH} obj depend DESTDIR=${WORLD}        ${CBUILD} DESTDIR=${WORLD} || exit 1
        env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \        ${CBUILD} DESTDIR=${WORLD} install || exit 1
                TARGET_ARCH=${TARGET_ARCH} DESTDIR=${WORLD} 
        env MAKEOBJDIRPREFIX=${BSDOBJ} BSDSRC=${BSDSRC} make TARGET=${TARGET} \ 
                TARGET_ARCH=${TARGET_ARCH} install DESTDIR=${WORLD} 
         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 224  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 294  compile_tools() Line 265  compile_tools()
         ${CBUILD} install          ${CBUILD} install
         cd -          cd -
   
        echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver        cd $CROSS_WIFINATOR
         ${WIFINATOR_CFG}
         ${CBUILD} clean
         ${CBUILD}
         ${CBUILD} install
         cd -
 
         cd $CROSS_TFTPD
         ${TFTPD_CFG}
         ${CBUILD} clean
         ${CBUILD}
         ${CBUILD} install
         cd -
 }  }
   
   install_tools()
   {
           LIBS="${ROMFS_USR2}/lib"
           LIBEXEC="${ROMFS_USR2}/libexec"
           BIN="${ROMFS_USR2}/bin"
           SBIN="${ROMFS_USR2}/sbin"
           ETC="${ROMFS_USR2}/etc"
   
           echo "+++ Install ELWIX RomFS secondary firmware ..."
   
           StripFiles \*.so\* ${PKG}/lib
           InstallFiles \*.so\* ${PKG}/lib $LIBS
           StripFiles \* ${PKG}/libexec
           InstallFiles \* ${PKG}/libexec $LIBEXEC
           StripFiles \* ${PKG}/bin
           InstallFiles \* ${PKG}/bin $BIN
           StripFiles \* ${PKG}/sbin
           InstallFiles \* ${PKG}/sbin $SBIN
   
           InstallFiles \* ${PKG}/etc $ETC
   
           chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS
   }
   
   build_tools()
   {
           echo "+++ Build ELWIX core firmware image ..."
   
           cd ${WORLD}/usr/local
           find . -name ".debug" -exec rm -rf {} \;
           pax -w -z -v -f${REL}/${LOCALFS_IMG} .
           cd -
   }
   
 ### 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
else#
        echo "Skipped ELWIX bootstrap pkgsrc tools build ..."#       echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
fi#else
 #        echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
 #fi
   
 V=${VERSION}  
 [ -r ${CENV} ] && . ${CENV}  
 unset INSTALL  
 unset VERSION  
 VERSION="$V"  
   
 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
         compile_tools || exit 1
 
         build_tools || exit 1
 
         echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
 else  else
         echo "Skipped ELWIX tools build ..."          echo "Skipped ELWIX tools build ..."
 fi  fi

Removed from v.1.5.4.3  
changed lines
  Added in v.1.7.2.3


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