NEX-9559 remove nza-closed cruft
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Steve Peng <steve.peng@nexenta.com>
5773 Extra pointless steps in kernel module builds
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef Sipek <jeffpc@josefsipek.net>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Rich Lowe <richlowe@richlowe.net>
NEX-1149 add debug tag to uname output on debug builds
OS-41 Support building with Jenkins
re #13825 backport illumos 3298 (link-editor version)
3298 illumos link-editor and related tools should be differentiable
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Garrett D'Amore <garrett@damore.org>
re #8813 rb3805 Failed to set DHCP on bnx0 network interface
8226 nza-kernel needs to be buildable by itself
Re #6790 backspace should perform delete on console
VAAI (XXX ATS support for COMSTAR, YYY Block-copy support for COMSTAR)

@@ -21,12 +21,12 @@
 #
 
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2008, 2010, Richard Lowe
-# Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2012 Joshua M. Clulow <josh@sysmgr.org>
+# Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2017 by Delphix. All rights reserved.
 #
 # Based on the nightly script from the integration folks,
 # Mostly modified and owned by mike_s.
 # Changes also by kjc, dmk.

@@ -104,10 +104,11 @@
         # non-DEBUG build ends
 
         # DEBUG build begins
 
         if [ "$D_FLAG" = "y" ]; then
+                VERSION=$VERSION":debug"
                 set_debug_build_flags
                 CODESIGN_USER="$crypto_signer" \
                     build "DEBUG" "$suffix" "" "$MULTI_PROTO"
         else
                 echo "\n==== No DEBUG $open_only build ====\n" >> "$LOGFILE"

@@ -1077,10 +1078,14 @@
         fi
 
         NIGHTLY_STATUS=$state
         export NIGHTLY_STATUS
 
+        # Want ${LLOG}/mail_msg available to POST_NIGHTLY
+        cat $build_time_file $build_environ_file $mail_msg_file \
+            > ${LLOG}/mail_msg
+
         run_hook POST_NIGHTLY $state
         run_hook SYS_POST_NIGHTLY $state
 
         #
         # mailx(1) sets From: based on the -r flag

@@ -1089,12 +1094,10 @@
         mailx_r=
         if [[ -n "${MAILFROM}" ]]; then
                 mailx_r="-r ${MAILFROM}"
         fi
 
-        cat $build_time_file $build_environ_file $mail_msg_file \
-            > ${LLOG}/mail_msg
         if [ "$m_FLAG" = "y" ]; then
                 cat ${LLOG}/mail_msg | /usr/bin/mailx ${mailx_r} -s \
         "Nightly ${MACH} Build of `basename ${CODEMGR_WS}` ${state}." \
                         ${MAILTO}
         fi