changeset 13152:c54ead303015

58 opensolaris.sh needs to become illumos.sh Reviewed by: jeppe@tenzer.dk Approved by: garrett@nexenta.com
author Garrett D'Amore <garrett@nexenta.com>
date Thu, 19 Aug 2010 10:12:52 -0700
parents 61094292b8c8
children 65c0e0c573e1
files usr/src/tools/env/Makefile usr/src/tools/env/illumos.sh usr/src/tools/env/opensolaris.sh
diffstat 3 files changed, 175 insertions(+), 183 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/tools/env/Makefile	Wed Aug 18 23:52:33 2010 -0700
+++ b/usr/src/tools/env/Makefile	Thu Aug 19 10:12:52 2010 -0700
@@ -24,7 +24,7 @@
 ENVFILES= \
 	developer \
 	gatekeeper \
-	opensolaris
+	illumos
 
 include ../Makefile.tools
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/tools/env/illumos.sh	Thu Aug 19 10:12:52 2010 -0700
@@ -0,0 +1,174 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#	Configuration variables for the runtime environment of the nightly
+# build script and other tools for construction and packaging of releases.
+# This script is sourced by 'nightly' and 'bldenv' to set up the environment
+# for the build. This example is suitable for building an OpenSolaris
+# workspace, which will contain the resulting archives. It is based
+# off the onnv release. It sets NIGHTLY_OPTIONS to make nightly do:
+#	DEBUG build only (-D, -F)
+#	do not bringover from the parent (-n)
+#	runs 'make check' (-C)
+#	runs lint in usr/src (-l plus the LINTDIRS variable)
+#	sends mail on completion (-m and the MAILTO variable)
+#	creates packages for PIT/RE (-p)
+#	checks for changes in ELF runpaths (-r)
+#	build and use this workspace's tools in $SRC/tools (-t)
+#
+NIGHTLY_OPTIONS="-FnCDlmprt";		export NIGHTLY_OPTIONS
+
+# This is a variable for the rest of the script - GATE doesn't matter to
+# nightly itself
+GATE=testws;			export GATE
+
+# CODEMGR_WS - where is your workspace at (or what should nightly name it)
+CODEMGR_WS="/export/$GATE";			export CODEMGR_WS
+
+#
+#  The following two macros are the closed/crypto binaries.  Once
+#  Illumos has totally freed itself, we can remove these references.
+#
+# Location of encumbered binaries.
+ON_CLOSED_BINS="$CODEMGR_WS/closed";		export ON_CLOSED_BINS
+# Location of signed cryptographic binaries.
+ON_CRYPTO_BINS="$CODEMGR_WS/on-crypto.$MACH.tar.bz2" export ON_CRYPTO_BINS
+
+
+# Maximum number of dmake jobs.  The recommended number is 2 + (2 *
+# NCPUS), where NCPUS is the number of CPUs on your build system.
+maxjobs() {
+	ncpu=`/usr/sbin/psrinfo -p`
+	expr $ncpu \* 2 + 2
+}
+DMAKE_MAX_JOBS=`maxjobs`;			export DMAKE_MAX_JOBS
+
+# path to onbld tool binaries
+ONBLD_BIN="/opt/onbld/bin"
+
+# PARENT_WS is used to determine the parent of this workspace. This is
+# for the options that deal with the parent workspace (such as where the
+# proto area will go).
+PARENT_WS="";			export PARENT_WS
+
+# CLONE_WS is the workspace nightly should do a bringover from.
+CLONE_WS="http://hg.illumos.org/illumos-gate"
+export CLONE_WS
+
+# The bringover, if any, is done as STAFFER.
+# Set STAFFER to your own login as gatekeeper or developer
+# The point is to use group "staff" and avoid referencing the parent
+# workspace as root.
+# Some scripts optionally send mail messages to MAILTO.
+#
+STAFFER=nobody;				export STAFFER
+MAILTO=$STAFFER;			export MAILTO
+
+# The project (see project(4)) under which to run this build.  If not
+# 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
+ATLOG="$CODEMGR_WS/log";			export ATLOG
+LOGFILE="$ATLOG/nightly.log";			export LOGFILE
+MACH=`uname -p`;				export MACH
+
+# REF_PROTO_LIST - for comparing the list of stuff in your proto area
+# with. Generally this should be left alone, since you want to see differences
+# from your parent (the gate).
+#
+REF_PROTO_LIST=$PARENT_WS/usr/src/proto_list_${MACH}; export REF_PROTO_LIST
+
+#
+#	build environment variables, including version info for mcs, motd,
+# motd, uname and boot messages. Mostly you shouldn't change this except
+# when the release slips (nah) or you move an environment file to a new
+# release
+#
+ROOT="$CODEMGR_WS/proto/root_${MACH}";	export ROOT
+SRC="$CODEMGR_WS/usr/src";         	export SRC
+VERSION="$GATE";			export VERSION
+
+#
+# the RELEASE and RELEASE_DATE variables are set in Makefile.master;
+# there might be special reasons to override them here, but that
+# should not be the case in general
+#
+# RELEASE="5.11";			export RELEASE
+# RELEASE_DATE="October 2007";		export RELEASE_DATE
+
+# proto area in parent for optionally depositing a copy of headers and
+# libraries corresponding to the protolibs target
+# not applicable given the NIGHTLY_OPTIONS
+#
+PARENT_ROOT=$PARENT_WS/proto/root_$MACH; export PARENT_ROOT
+PARENT_TOOLS_ROOT=$PARENT_WS/usr/src/tools/proto/root_$MACH-nd; export PARENT_TOOLS_ROOT
+
+# Package creation variables.  You probably shouldn't change these,
+# either.
+#
+# PKGARCHIVE determines where the repository will be created.
+#
+# PKGPUBLISHER_REDIST controls the publisher setting for the repository.
+#
+PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly";	export PKGARCHIVE
+# PKGPUBLISHER_REDIST="on-redist";			export PKGPUBLISHER_REDIST
+
+# we want make to do as much as it can, just in case there's more than
+# one problem.
+MAKEFLAGS=k;	export MAKEFLAGS
+
+# Magic variable to prevent the devpro compilers/teamware from sending
+# mail back to devpro on every use.
+UT_NO_USAGE_TRACKING="1"; export UT_NO_USAGE_TRACKING
+
+# Build tools - don't change these unless you know what you're doing.  These
+# variables allows you to get the compilers and onbld files locally or
+# through cachefs.  Set BUILD_TOOLS to pull everything from one location.
+# Alternately, you can set ONBLD_TOOLS to where you keep the contents of
+# SUNWonbld and SPRO_ROOT to where you keep the compilers.  SPRO_VROOT
+# exists to make it easier to test new versions of the compiler.
+BUILD_TOOLS=/opt;				export BUILD_TOOLS
+#ONBLD_TOOLS=/opt/onbld;			export ONBLD_TOOLS
+SPRO_ROOT=/opt/SUNWspro;			export SPRO_ROOT
+SPRO_VROOT=$SPRO_ROOT;				export SPRO_VROOT
+
+# This goes along with lint - it is a series of the form "A [y|n]" which
+# means "go to directory A and run 'make lint'" Then mail me (y) the
+# difference in the lint output. 'y' should only be used if the area you're
+# linting is actually lint clean or you'll get lots of mail.
+# You shouldn't need to change this though.
+#LINTDIRS="$SRC y";	export LINTDIRS
+
+# Set this flag to 'n' to disable the automatic validation of the dmake
+# version in use.  The default is to check it.
+#CHECK_DMAKE=y
+
+# Set this flag to 'n' to disable the use of 'checkpaths'.  The default,
+# if the 'N' option is not specified, is to run this test.
+#CHECK_PATHS=y
+
+# POST_NIGHTLY can be any command to be run at the end of nightly.  See
+# nightly(1) for interactions between environment variables and this command.
+#POST_NIGHTLY=
--- a/usr/src/tools/env/opensolaris.sh	Wed Aug 18 23:52:33 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-#	Configuration variables for the runtime environment of the nightly
-# build script and other tools for construction and packaging of releases.
-# This script is sourced by 'nightly' and 'bldenv' to set up the environment
-# for the build. This example is suitable for building an OpenSolaris
-# workspace, which will contain the resulting archives. It is based
-# off the onnv release. It sets NIGHTLY_OPTIONS to make nightly do:
-#	DEBUG build only (-D, -F)
-#	do not bringover from the parent (-n)
-#	runs 'make check' (-C)
-#	runs lint in usr/src (-l plus the LINTDIRS variable)
-#	sends mail on completion (-m and the MAILTO variable)
-#	creates packages for PIT/RE (-p)
-#	checks for changes in ELF runpaths (-r)
-#	build and use this workspace's tools in $SRC/tools (-t)
-#
-NIGHTLY_OPTIONS="-FnCDlmprt";		export NIGHTLY_OPTIONS
-
-# This is a variable for the rest of the script - GATE doesn't matter to
-# nightly itself
-GATE=testws;			export GATE
-
-# CODEMGR_WS - where is your workspace at (or what should nightly name it)
-CODEMGR_WS="/export/$GATE";			export CODEMGR_WS
-
-# Location of encumbered binaries.
-ON_CLOSED_BINS="$CODEMGR_WS/closed";		export ON_CLOSED_BINS
-
-# This flag controls whether to build the closed source.  If
-# undefined, nightly(1) and bldenv(1) will set it according to whether
-# the closed source tree is present.  CLOSED_IS_PRESENT="no" means not
-# building the closed sources.
-# CLOSED_IS_PRESENT="no";		export CLOSED_IS_PRESENT
-
-# Maximum number of dmake jobs.  The recommended number is 2 + (2 *
-# NCPUS), where NCPUS is the number of CPUs on your build system.
-maxjobs() {
-	ncpu=`/usr/sbin/psrinfo -p`
-	expr $ncpu \* 2 + 2
-}
-DMAKE_MAX_JOBS=`maxjobs`;			export DMAKE_MAX_JOBS
-
-# path to onbld tool binaries
-ONBLD_BIN="/opt/onbld/bin"
-
-# PARENT_WS is used to determine the parent of this workspace. This is
-# for the options that deal with the parent workspace (such as where the
-# proto area will go).
-PARENT_WS="";			export PARENT_WS
-
-# CLONE_WS is the workspace nightly should do a bringover from.
-CLONE_WS="ssh://anon@hg.opensolaris.org//hg/onnv/onnv-gate"
-export CLONE_WS
-
-# The bringover, if any, is done as STAFFER.
-# Set STAFFER to your own login as gatekeeper or developer
-# The point is to use group "staff" and avoid referencing the parent
-# workspace as root.
-# Some scripts optionally send mail messages to MAILTO.
-#
-STAFFER=nobody;				export STAFFER
-MAILTO=$STAFFER;			export MAILTO
-
-# The project (see project(4)) under which to run this build.  If not
-# 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
-ATLOG="$CODEMGR_WS/log";			export ATLOG
-LOGFILE="$ATLOG/nightly.log";			export LOGFILE
-MACH=`uname -p`;				export MACH
-
-# Location of signed cryptographic binaries.
-ON_CRYPTO_BINS="$CODEMGR_WS/on-crypto.$MACH.tar.bz2"
-export ON_CRYPTO_BINS
-
-# REF_PROTO_LIST - for comparing the list of stuff in your proto area
-# with. Generally this should be left alone, since you want to see differences
-# from your parent (the gate).
-#
-REF_PROTO_LIST=$PARENT_WS/usr/src/proto_list_${MACH}; export REF_PROTO_LIST
-
-#
-#	build environment variables, including version info for mcs, motd,
-# motd, uname and boot messages. Mostly you shouldn't change this except
-# when the release slips (nah) or you move an environment file to a new
-# release
-#
-ROOT="$CODEMGR_WS/proto/root_${MACH}";	export ROOT
-SRC="$CODEMGR_WS/usr/src";         	export SRC
-VERSION="$GATE";			export VERSION
-
-#
-# the RELEASE and RELEASE_DATE variables are set in Makefile.master;
-# there might be special reasons to override them here, but that
-# should not be the case in general
-#
-# RELEASE="5.11";			export RELEASE
-# RELEASE_DATE="October 2007";		export RELEASE_DATE
-
-# proto area in parent for optionally depositing a copy of headers and
-# libraries corresponding to the protolibs target
-# not applicable given the NIGHTLY_OPTIONS
-#
-PARENT_ROOT=$PARENT_WS/proto/root_$MACH; export PARENT_ROOT
-PARENT_TOOLS_ROOT=$PARENT_WS/usr/src/tools/proto/root_$MACH-nd; export PARENT_TOOLS_ROOT
-
-# Package creation variables.  You probably shouldn't change these,
-# either.
-#
-# PKGARCHIVE determines where the repository will be created.
-#
-# PKGPUBLISHER_REDIST controls the publisher setting for the repository.
-#
-PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly";	export PKGARCHIVE
-# PKGPUBLISHER_REDIST="on-redist";			export PKGPUBLISHER_REDIST
-
-# we want make to do as much as it can, just in case there's more than
-# one problem.
-MAKEFLAGS=k;	export MAKEFLAGS
-
-# Magic variable to prevent the devpro compilers/teamware from sending
-# mail back to devpro on every use.
-UT_NO_USAGE_TRACKING="1"; export UT_NO_USAGE_TRACKING
-
-# Build tools - don't change these unless you know what you're doing.  These
-# variables allows you to get the compilers and onbld files locally or
-# through cachefs.  Set BUILD_TOOLS to pull everything from one location.
-# Alternately, you can set ONBLD_TOOLS to where you keep the contents of
-# SUNWonbld and SPRO_ROOT to where you keep the compilers.  SPRO_VROOT
-# exists to make it easier to test new versions of the compiler.
-BUILD_TOOLS=/opt;				export BUILD_TOOLS
-#ONBLD_TOOLS=/opt/onbld;			export ONBLD_TOOLS
-SPRO_ROOT=/opt/SUNWspro;			export SPRO_ROOT
-SPRO_VROOT=$SPRO_ROOT;				export SPRO_VROOT
-
-# This goes along with lint - it is a series of the form "A [y|n]" which
-# means "go to directory A and run 'make lint'" Then mail me (y) the
-# difference in the lint output. 'y' should only be used if the area you're
-# linting is actually lint clean or you'll get lots of mail.
-# You shouldn't need to change this though.
-#LINTDIRS="$SRC y";	export LINTDIRS
-
-# Set this flag to 'n' to disable the automatic validation of the dmake
-# version in use.  The default is to check it.
-#CHECK_DMAKE=y
-
-# Set this flag to 'n' to disable the use of 'checkpaths'.  The default,
-# if the 'N' option is not specified, is to run this test.
-#CHECK_PATHS=y
-
-# BRINGOVER_FILES is the list of files nightly passes to bringover.
-# If not set the default is "usr", but it can be used for bringing
-# over deleted_files or other nifty directories.
-#BRINGOVER_FILES="usr deleted_files"
-
-# POST_NIGHTLY can be any command to be run at the end of nightly.  See
-# nightly(1) for interactions between environment variables and this command.
-#POST_NIGHTLY=