Print this page
Support for PREBUILT_ILLUMOS, and optional /tmp/debug.$$ output.

Split Close
Expand all
Collapse all
          --- old/build/illumos/build.sh
          +++ new/build/illumos/build.sh
↓ open down ↓ 157 lines elided ↑ open up ↑
 158  158      logcmd cp usr/src/tools/scripts/nightly.sh .
 159  159      logcmd chmod +x nightly.sh
 160  160      logcmd ./nightly.sh illumos.sh || logerr "Nightly failed"
 161  161      logmsg "Leaving $CODEMGR_WS"
 162  162      popd > /dev/null
 163  163  }
 164  164  
 165  165  push_pkgs() {
 166  166      logmsg "Entering $CODEMGR_WS"
 167  167      pushd $CODEMGR_WS > /dev/null
 168      -    logmsg "Intentional pause: Last chance to sanity-check before publication!"
 169  168      logmsg "Pushing illumos pkgs to $PKGSRVR..."
 170      -    ask_to_continue
      169 +    if [[ -z $BATCH ]]; then
      170 +        logmsg "Intentional pause: Last chance to sanity-check before publication!"
      171 +        ask_to_continue
      172 +    fi
 171  173      logcmd pkgrecv -s packages/i386/nightly-nd/repo.redist/ -d $PKGSRVR 'pkg:/*'
 172  174      logmsg "Leaving $CODEMGR_WS"
 173  175      popd > /dev/null
 174  176  }
 175  177  
 176  178  init
 177  179  prep_build
 178      -sunstudio_location
 179      -clone_source
 180      -modify_build_script
 181      -closed_bins
 182      -build_tools
 183      -build_pkgs
 184      -push_pkgs
      180 +if [ -d ${PREBUILT_ILLUMOS:-/dev/null} ]; then
      181 +    wait_for_prebuilt
      182 +    # Check for existing packages, or for freshly built ones if we pwaited.
      183 +    if [ -d $PREBUILT_ILLUMOS/packages/i386/nightly-nd/repo.redist ]; then
      184 +        logmsg "Using illumos-omnios pre-compiled at $PREBUILT_ILLUMOS"
      185 +        CODEMGR_WS=$PREBUILT_ILLUMOS
      186 +        push_pkgs
      187 +    else
      188 +        logmsg "No $PREBUILT_ILLUMOS/packages/i386/nightly-nd/repo.redist"
      189 +        if [[ -z $BATCH ]]; then
      190 +            ask_to_continue
      191 +        fi
      192 +    fi
      193 +else
      194 +    sunstudio_location
      195 +    clone_source
      196 +    modify_build_script
      197 +    closed_bins
      198 +    build_tools
      199 +    build_pkgs
      200 +    push_pkgs
      201 +fi
 185  202  clean_up
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX