[BACK]Return to build.sh CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/build.sh between version 1.251 and 1.251.2.2

version 1.251, 2011/10/17 16:22:12 version 1.251.2.2, 2012/10/30 18:46:04
Line 503  initdefaults()
Line 503  initdefaults()
         do_syspkgs=false          do_syspkgs=false
         do_iso_image=false          do_iso_image=false
         do_iso_image_source=false          do_iso_image_source=false
           do_live_image=false
           do_install_image=false
         do_params=false          do_params=false
         do_rump=false          do_rump=false
   
Line 552  getarch()
Line 554  getarch()
         #          #
         case "${MACHINE}" in          case "${MACHINE}" in
   
           evbearm-e[bl])
                   makewrappermachine=${MACHINE}
                   # MACHINE_ARCH is "arm" or "armeb", not "armel"
                   MACHINE_ARCH=earm${MACHINE##*-}
                   MACHINE_ARCH=${MACHINE_ARCH%el}
                   MACHINE=evbarm
                   ;;
   
         evbarm-e[bl])          evbarm-e[bl])
                 makewrappermachine=${MACHINE}                  makewrappermachine=${MACHINE}
                 # MACHINE_ARCH is "arm" or "armeb", not "armel"                  # MACHINE_ARCH is "arm" or "armeb", not "armel"
Line 669  validatearch()
Line 679  validatearch()
         #          #
         case "${MACHINE_ARCH}" in          case "${MACHINE_ARCH}" in
   
         alpha|arm|armeb|hppa|i386|m68000|m68k|mipse[bl]|mips64e[bl]|powerpc|powerpc64|sh3e[bl]|sparc|sparc64|vax|x86_64|ia64)          alpha|arm|armeb|earm|earmeb|hppa|i386|m68000|m68k|mipse[bl]|mips64e[bl]|powerpc|powerpc64|sh3e[bl]|sparc|sparc64|vax|x86_64|ia64)
                 ;;                  ;;
   
         "")          "")
Line 687  validatearch()
Line 697  validatearch()
         case "${MACHINE}" in          case "${MACHINE}" in
   
         evbarm)          evbarm)
                 arches="arm armeb"                  arches="arm armeb earm earmeb"
                   ;;
   
           cats|iyonix|netwinder|shark|zaurus)
                   arches="arm earm"
                 ;;                  ;;
   
         algor|arc|cobalt|pmax)          algor|arc|cobalt|pmax)
Line 864  Usage: ${progname} [-EhnorUuxy] [-a arch
Line 878  Usage: ${progname} [-EhnorUuxy] [-a arch
                         RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.                          RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
     iso-image           Create CD-ROM image in RELEASEDIR/iso.      iso-image           Create CD-ROM image in RELEASEDIR/iso.
     iso-image-source    Create CD-ROM image with source in RELEASEDIR/iso.      iso-image-source    Create CD-ROM image with source in RELEASEDIR/iso.
       live-image          Create bootable live image in
                           RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
       install-image       Create bootable installation image in
                           RELEASEDIR/RELEASEMACHINEDIR/installation/installimage.
     params              Display various make(1) parameters.      params              Display various make(1) parameters.
   
  Options:   Options:
Line 1135  parseoptions()
Line 1153  parseoptions()
                         op=iso_image_source   # used as part of a variable name                          op=iso_image_source   # used as part of a variable name
                         ;;                          ;;
   
                   live-image)
                           op=live_image   # used as part of a variable name
                           ;;
   
                   install-image)
                           op=install_image # used as part of a variable name
                           ;;
   
                 kernel=*|releasekernel=*)                  kernel=*|releasekernel=*)
                         arg=${op#*=}                          arg=${op#*=}
                         op=${op%%=*}                          op=${op%%=*}
Line 1387  rebuildmake()
Line 1413  rebuildmake()
 # Perform some late sanity checks, after rebuildmake,  # Perform some late sanity checks, after rebuildmake,
 # but before createmakewrapper or any real work.  # but before createmakewrapper or any real work.
 #  #
 # Also create the top-level obj directory.  # Creates the top-level obj directory, because that
   # is needed by some of the sanity checks.
   #
   # Prints status messages reporting the values of several variables.
 #  #
 validatemakeparams()  validatemakeparams()
 {  {
           # MAKECONF (which defaults to /etc/mk.conf in share/mk/bsd.own.mk)
           # can affect many things, so mention it in an early status message.
           #
           MAKECONF=$(getmakevar MAKECONF)
           if [ -e "${MAKECONF}" ]; then
                   statusmsg2 "MAKECONF file:" "${MAKECONF}"
           else
                   statusmsg2 "MAKECONF file:" "${MAKECONF} (File not found)"
           fi
   
         if [ "${runcmd}" = "echo" ]; then          if [ "${runcmd}" = "echo" ]; then
                 TOOLCHAIN_MISSING=no                  TOOLCHAIN_MISSING=no
                 EXTERNAL_TOOLCHAIN=""                  EXTERNAL_TOOLCHAIN=""
Line 1565  validatemakeparams()
Line 1604  validatemakeparams()
                 fi                  fi
                 ;;                  ;;
         esac          esac
   
           # live-image and install-image targets require binary sets
           # (actually DESTDIR/etc/mtree/set.* files) built with MKUNPRIVED.
           # If release operation is specified with live-image or install-image,
           # the release op should be performed with -U for later image ops.
           #
           if ${do_release} && ( ${do_live_image} || ${do_install_image} ) && \
               [ "${MKUNPRIVED}" = "no" ] ; then
                   bomb "-U must be specified on building release to create images later."
           fi
 }  }
   
   
Line 1783  buildmodules()
Line 1832  buildmodules()
   
         statusmsg "Building kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"          statusmsg "Building kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
         if [ "${MKOBJDIRS}" != "no" ]; then          if [ "${MKOBJDIRS}" != "no" ]; then
                 make_in_dir sys/modules obj ||                  make_in_dir sys/modules obj
                     bomb "Failed to make obj in sys/modules"  
         fi          fi
         if [ "${MKUPDATE}" = "no" ]; then          if [ "${MKUPDATE}" = "no" ]; then
                 make_in_dir sys/modules cleandir                  make_in_dir sys/modules cleandir
         fi          fi
         ${runcmd} "${makewrapper}" ${parallel} do-sys-modules ||          make_in_dir sys/modules dependall
             bomb "Failed to make do-sys-modules"          make_in_dir sys/modules install
   
         statusmsg "Successful build of kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"          statusmsg "Successful build of kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
 }  }
Line 1830  installworld()
Line 1878  installworld()
 RUMP_LIBSETS='  RUMP_LIBSETS='
         -lrump,          -lrump,
         -lrumpvfs -lrump,          -lrumpvfs -lrump,
         -lrumpdev -lrump,          -lrumpvfs -lrumpdev -lrump,
         -lrumpnet -lrump,          -lrumpnet -lrump,
         -lrumpkern_tty -lrumpvfs -lrump,          -lrumpkern_tty -lrumpvfs -lrump,
         -lrumpfs_tmpfs -lrumpvfs -lrump,          -lrumpfs_tmpfs -lrumpvfs -lrump,
Line 1960  main()
Line 2008  main()
                         statusmsg "Successful make ${op}"                          statusmsg "Successful make ${op}"
                         ;;                          ;;
   
                   live-image|install-image)
                           # install-image and live-image require mtree spec files
                           # built with UNPRIVED.  Assume UNPRIVED build has been
                           # performed if METALOG file is created in DESTDIR.
                           if [ ! -e "${DESTDIR}/METALOG" ] ; then
                                   bomb "The release binaries must have been built with -U to create images."
                           fi
                           ${runcmd} "${makewrapper}" ${parallel} ${op} ||
                               bomb "Failed to make ${op}"
                           statusmsg "Successful make ${op}"
                           ;;
                 kernel=*)                  kernel=*)
                         arg=${op#*=}                          arg=${op#*=}
                         buildkernel "${arg}"                          buildkernel "${arg}"

Legend:
Removed from v.1.251  
changed lines
  Added in v.1.251.2.2

CVSweb <webmaster@jp.NetBSD.org>