diff options
| author | Josef 'Jeff' Sipek <josef.sipek@nexenta.com> | 2014-08-15 10:32:59 -0400 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2014-08-15 13:08:15 -0700 |
| commit | 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8 (patch) | |
| tree | 183bd4ca6ec7f3b6f47575031d3e298c554c1326 | |
| parent | 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2 (diff) | |
| download | illumos-joyent-60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8.tar.gz | |
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/tools/env/developer.sh | 3 | ||||
| -rw-r--r-- | usr/src/tools/env/gatekeeper.sh | 3 | ||||
| -rw-r--r-- | usr/src/tools/env/illumos.sh | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/tools/env/developer.sh b/usr/src/tools/env/developer.sh index 988c11c98b..6f7017aeec 100644 --- a/usr/src/tools/env/developer.sh +++ b/usr/src/tools/env/developer.sh @@ -74,8 +74,7 @@ MAILTO=$STAFFER; export MAILTO # specified, the build is simply run in a new task in the current project. BUILD_PROJECT=; export BUILD_PROJECT -# You should not need to change the next four lines -LOCKNAME="`basename $CODEMGR_WS`_nightly.lock"; export LOCKNAME +# You should not need to change the next three lines ATLOG="$CODEMGR_WS/log"; export ATLOG LOGFILE="$ATLOG/nightly.log"; export LOGFILE MACH=`uname -p`; export MACH diff --git a/usr/src/tools/env/gatekeeper.sh b/usr/src/tools/env/gatekeeper.sh index f801ee920a..db3db9cb34 100644 --- a/usr/src/tools/env/gatekeeper.sh +++ b/usr/src/tools/env/gatekeeper.sh @@ -83,8 +83,7 @@ MAILTO=$STAFFER; export MAILTO # specified, the build is simply run in a new task in the current project. BUILD_PROJECT=; export BUILD_PROJECT -# You should not need to change the next four lines -LOCKNAME="`basename $CODEMGR_WS`_nightly.lock"; export LOCKNAME +# You should not need to change the next three lines ATLOG="$CODEMGR_WS/log"; export ATLOG LOGFILE="$ATLOG/nightly.log"; export LOGFILE MACH=`uname -p`; export MACH diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh index 825d172e65..ecfec4d795 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -128,8 +128,7 @@ export MAILTO="$STAFFER" # specified, the build is simply run in a new task in the current project. export BUILD_PROJECT='' -# You should not need to change the next four lines -export LOCKNAME="$(basename -- "$CODEMGR_WS")_nightly.lock" +# You should not need to change the next three lines export ATLOG="$CODEMGR_WS/log" export LOGFILE="$ATLOG/nightly.log" export MACH="$(uname -p)" |