diff options
Diffstat (limited to 'usr/src/tools/scripts/nightly')
| -rwxr-xr-x | usr/src/tools/scripts/nightly | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/usr/src/tools/scripts/nightly b/usr/src/tools/scripts/nightly index 489f63b897..f6b536c924 100755 --- a/usr/src/tools/scripts/nightly +++ b/usr/src/tools/scripts/nightly @@ -29,6 +29,7 @@ # Copyright 2020 Joyent, Inc. # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # Copyright 2019 Peter Trible. +# Copyright 2020 Oxide Computer Company # # Based on the nightly script from the integration folks, # Mostly modified and owned by mike_s. @@ -804,18 +805,20 @@ abssrcdirs="$SRC" PROTOCMPTERSE="protocmp.terse -gu" POUND_SIGN="#" +basews="$(basename "$CODEMGR_WS")" # have we set RELEASE_DATE in our env file? if [ -z "$RELEASE_DATE" ]; then RELEASE_DATE=$(LC_ALL=C date +"%B %Y") fi -BUILD_DATE=$(LC_ALL=C date +%Y-%b-%d) -BASEWSDIR=$(basename $CODEMGR_WS) -DEV_CM="\"@(#)SunOS Internal Development: $LOGNAME $BUILD_DATE [$BASEWSDIR]\"" +now=$(LC_ALL=C date +%Y-%b-%d) +DEV_CM_TAIL="development build: $LOGNAME $now [$basews]" -# we export POUND_SIGN, RELEASE_DATE and DEV_CM to speed up the build process -# by avoiding repeated shell invocations to evaluate Makefile.master +# +# We export POUND_SIGN, RELEASE_DATE and DEV_CM_TAIL to speed up the build +# process by avoiding repeated shell invocations to evaluate Makefile.master # definitions. -export POUND_SIGN RELEASE_DATE DEV_CM +# +export POUND_SIGN RELEASE_DATE DEV_CM_TAIL maketype="distributed" if [[ -z "$MAKE" ]]; then @@ -1027,9 +1030,9 @@ function logshuffle { 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} + /usr/bin/mailx ${mailx_r} -s \ + "Nightly ${MACH} Build of ${basews} ${state}." \ + "${MAILTO}" < "${LLOG}/mail_msg" fi if [ "$u_FLAG" = "y" -a "$build_ok" = "y" ]; then @@ -1086,7 +1089,6 @@ function create_lock { eval $lockvar=$lockf while ! staffer ln -s $hostname.$STAFFER.$$ $lockf 2> /dev/null; do - basews=`basename $CODEMGR_WS` ls -l $lockf | nawk '{print $NF}' | IFS=. read host user pid if [ "$host" != "$hostname" ]; then echo "$MACH build of $basews apparently" \ |