6455242 nightly should be able to preserve all proto areas from a single build.

6460124 nightly -X doesn't properly copy the IHV proto area
6463720 more realmode build cleanup

2 files changed, 12 insertions, 54 deletions

diff --git a/usr/src/tools/env/developer.sh b/usr/src/tools/env/developer.sh
index b33f4e626a..908fef98f0 100644
--- a/usr/src/tools/env/developer.sh
+++ b/usr/src/tools/env/developer.sh
@@ -18,12 +18,14 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 #	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
@@ -156,11 +158,6 @@ UT_NO_USAGE_TRACKING="1"; export UT_NO_USAGE_TRACKING
 #LINTDIRS="$SRC y";	export LINTDIRS
 
 #
-# NT server for realmode builds
-#
-#NTSERVER=<hostname>;			export NTSERVER
-
-#
 # Reference to IA32 IHV workspace, proto area and packages
 #
 #IA32_IHV_WS=/ws/${GATE}-ihv;				export IA32_IHV_WS
@@ -168,35 +165,17 @@ UT_NO_USAGE_TRACKING="1"; export UT_NO_USAGE_TRACKING
 #IA32_IHV_PKGS=$IA32_IHV_WS/packages/i386/nightly;	export IA32_IHV_PKGS
 
 #
-# Reference to binary-only IA32 IHV packages (for boot floppy construction)
+# Reference to binary-only IA32 IHV packages
 #
-#IA32_IHV_BINARY_PKGS=/ws/${GATE}_ihv_bin
+#IA32_IHV_BINARY_PKGS=/ws/${GATE}-ihv-bin
 #export IA32_IHV_BINARY_PKGS
 
 #
-# Boot floppy proto area
-#
-#DCB_ROOT="${CODEMGR_WS}/proto/root_dcb_${MACH}"
-#BOOTFLOPPY_ROOT="${CODEMGR_WS}/proto/root_BootFloppy_${MACH}"
-#export DCB_ROOT
-#export BOOTFLOPPY_ROOT
-
-#
 # Destination for sparc realmode package SUNWrmodu
 #
 #SPARC_RM_PKGARCHIVE="${CODEMGR_WS}/packages/sparc_realmode/nightly"
 #export SPARC_RM_PKGARCHIVE
 
-# REF_PROTO_LIST_DCB & REF_PROTO_LIST_BOOTFLOPPY
-# To compare the list of stuff in your DCB and BootFloppy proto areas
-# against. Generally this should be left alone, since you want to see
-# differences from your parent (the gate).
-#
-#REF_PROTO_LIST_DCB=$PARENT_WS/usr/src/realmode/proto_list_dcb_${MACH}
-#REF_PROTO_LIST_BOOTFLOPPY=$PARENT_WS/usr/src/realmode/proto_list_bootfloppy_${MACH}
-#export REF_PROTO_LIST_DCB
-#export REF_PROTO_LIST_BOOTFLOPPY
-
 # 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
diff --git a/usr/src/tools/env/gatekeeper.sh b/usr/src/tools/env/gatekeeper.sh
index 6dcf9f0112..6b52e87dc3 100644
--- a/usr/src/tools/env/gatekeeper.sh
+++ b/usr/src/tools/env/gatekeeper.sh
@@ -18,12 +18,14 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 #	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
@@ -166,11 +168,6 @@ UT_NO_USAGE_TRACKING="1"; export UT_NO_USAGE_TRACKING
 #LINTDIRS="$SRC y";	export LINTDIRS
 
 #
-# NT server for realmode builds
-#
-#NTSERVER=<hostname>;			export NTSERVER
-
-#
 # Reference to IA32 IHV workspace, proto area and packages
 #
 #IA32_IHV_WS=/ws/${GATE}-ihv;				export IA32_IHV_WS
@@ -178,35 +175,17 @@ UT_NO_USAGE_TRACKING="1"; export UT_NO_USAGE_TRACKING
 #IA32_IHV_PKGS=$IA32_IHV_WS/packages/i386/nightly;	export IA32_IHV_PKGS
 
 #
-# Reference to binary-only IA32 IHV packages (for boot floppy construction)
+# Reference to binary-only IA32 IHV packages
 #
-#IA32_IHV_BINARY_PKGS=/ws/${GATE}_ihv_bin
+#IA32_IHV_BINARY_PKGS=/ws/${GATE}-ihv-bin
 #export IA32_IHV_BINARY_PKGS
 
 #
-# Boot floppy proto area
-#
-#DCB_ROOT="${CODEMGR_WS}/proto/root_dcb_${MACH}"
-#BOOTFLOPPY_ROOT="${CODEMGR_WS}/proto/root_BootFloppy_${MACH}"
-#export DCB_ROOT
-#export BOOTFLOPPY_ROOT
-
-#
 # Destination for sparc realmode package SUNWrmodu
 #
 #SPARC_RM_PKGARCHIVE="${CODEMGR_WS}/packages/sparc_realmode/nightly"
 #export SPARC_RM_PKGARCHIVE
 
-# REF_PROTO_LIST_DCB & REF_PROTO_LIST_BOOTFLOPPY
-# To compare the list of stuff in your DCB and BootFloppy proto areas
-# against. Generally this should be left alone, since you want to see
-# differences between todays build and yesterdays.
-#
-#REF_PROTO_LIST_DCB=$PARENT_WS/usr/src/realmode/proto_list_dcb_${MACH}
-#REF_PROTO_LIST_BOOTFLOPPY=$PARENT_WS/usr/src/realmode/proto_list_bootfloppy_${MACH}
-#export REF_PROTO_LIST_DCB
-#export REF_PROTO_LIST_BOOTFLOPPY
-
 # 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