backout 6455242/6460124/6463720/6455242: needs more work

9 files changed, 160 insertions, 180 deletions

diff --git a/usr/src/pkgdefs/SUNWpcmci/prototype_com b/usr/src/pkgdefs/SUNWpcmci/prototype_com
index 32716c64c6..41421947e0 100644
--- a/usr/src/pkgdefs/SUNWpcmci/prototype_com
+++ b/usr/src/pkgdefs/SUNWpcmci/prototype_com
@@ -2,8 +2,9 @@
 # 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.
+# Common Development and Distribution License, Version 1.0 only
+# (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.
@@ -18,14 +19,12 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+#ident	"%Z%%M%	%I%	%E% SMI"
 #
-
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
 # and their location on the development machine when building the package.
@@ -51,7 +50,7 @@ i i.initd
 #
 d none etc 0755 root sys
 d none etc/init.d 0755 root sys
-e initd etc/init.d/pcmcia 0744 root sys
+e initd etc/init.d/pcmcia=etc/init.d/pcmcia 0744 root sys
 d none kernel 0755 root sys
 d none kernel/drv 0755 root sys
 f none kernel/drv/pcic.conf 0644 root sys
diff --git a/usr/src/tools/env/developer.sh b/usr/src/tools/env/developer.sh
index 908fef98f0..b33f4e626a 100644
--- a/usr/src/tools/env/developer.sh
+++ b/usr/src/tools/env/developer.sh
@@ -18,14 +18,12 @@
 #
 # 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
@@ -158,6 +156,11 @@ 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
@@ -165,17 +168,35 @@ 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
+# Reference to binary-only IA32 IHV packages (for boot floppy construction)
 #
-#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 6b52e87dc3..6dcf9f0112 100644
--- a/usr/src/tools/env/gatekeeper.sh
+++ b/usr/src/tools/env/gatekeeper.sh
@@ -18,14 +18,12 @@
 #
 # 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
@@ -168,6 +166,11 @@ 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
@@ -175,17 +178,35 @@ 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
+# Reference to binary-only IA32 IHV packages (for boot floppy construction)
 #
-#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
diff --git a/usr/src/tools/protocmp/protodir.c b/usr/src/tools/protocmp/protodir.c
index 352c36a8b2..9a5f0200df 100644
--- a/usr/src/tools/protocmp/protodir.c
+++ b/usr/src/tools/protocmp/protodir.c
@@ -2,8 +2,9 @@
  * 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.
+ * Common Development and Distribution License, Version 1.0 only
+ * (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.
@@ -18,9 +19,8 @@
  *
  * CDDL HEADER END
  */
-
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -128,23 +128,12 @@ parse_proto_line(const char *basedir, char *line, elem_list *list, short arch,
 		/*
 		 * The '=' operator is subtly different for link and non-link
 		 * entries.  For the hard or soft link case, the left hand side
-		 * exists in the proto area and is created by the package.
-		 *
-		 * When the file is an editable file, it's very likely that the
-		 * right hand side is only a fragment of that file, which is
-		 * delivered by multiple packages in the consolidation.  Thus it
-		 * can't exist in the proto area, and because we can't really
-		 * know where the file's root directory is, we should skip the
-		 * file.
-		 *
-		 * For all other filetypes, assume the right hand side is in the
-		 * proto area.
+		 * exists in the proto area and is created by the package.  For
+		 * the other cases, the right hand side is in the proto area.
 		 */
 		if (e->file_type == SYM_LINK_T || e->file_type == LINK_T) {
 			*src++ = '\0';
 			e->symsrc = strdup(src);
-		} else if (e->file_type == EDIT_T) {
-			return (0);
 		} else {
 			file = src + 1;
 		}
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh
index 82523157ce..455fd16043 100644
--- a/usr/src/tools/scripts/bldenv.sh
+++ b/usr/src/tools/scripts/bldenv.sh
@@ -190,9 +190,6 @@ else
 	export RELEASE_BUILD ; RELEASE_BUILD=
 	unset EXTRA_OPTIONS
 	unset EXTRA_CFLAGS
-	if [ "$SINGLE_PROTO" = "no" ]; then
-		ROOT=$ROOT-nd
-	fi
 fi
 
 # update build-type variables
diff --git a/usr/src/tools/scripts/checkpaths.sh b/usr/src/tools/scripts/checkpaths.sh
index 965595ed74..723ee14219 100644
--- a/usr/src/tools/scripts/checkpaths.sh
+++ b/usr/src/tools/scripts/checkpaths.sh
@@ -19,12 +19,11 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+#ident	"%Z%%M%	%I%	%E% SMI"
 
 # Quis custodiet ipsos custodies?
 
@@ -68,8 +67,8 @@ fi
 for ROOT in $rootlist
 do
 	case "$ROOT" in
-	*sparc|*sparc-nd)	arch=sparc;;
-	*i386|*i386-nd)		arch=i386;;
+	*sparc)	arch=sparc;;
+	*i386)	arch=i386;;
 	*)
 		echo "$ROOT has unknown architecture." >&2
 		exit 1
diff --git a/usr/src/tools/scripts/makebfu.sh b/usr/src/tools/scripts/makebfu.sh
index 8ac08a7c52..951a769833 100644
--- a/usr/src/tools/scripts/makebfu.sh
+++ b/usr/src/tools/scripts/makebfu.sh
@@ -3,8 +3,9 @@
 # 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.
+# Common Development and Distribution License, Version 1.0 only
+# (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.
@@ -19,14 +20,12 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+#ident	"%Z%%M%	%I%	%E% SMI"
 #
-
 # Builds bfu archives. If no arguments, uses the environment variables
 # already set (by bldenv). One argument specifies an environment file
 # like nightly or bldenv uses.
@@ -94,6 +93,7 @@ export I_REALLY_WANT_TO_RUN_MKBFU=YES
 echo "Making ${archivetype}archives from $ROOT in $CPIODIR."
 if [ "$o_FLAG" != "y" -a -n "$MACH" -a -n "$SRC" -a -d "$SRC/pkgdefs" ]; then
 	pkg=$SRC/pkgdefs
+	bpkg=$SRC/realmode/pkgdefs
 	if [[ -d $SRC/../closed/pkgdefs && \
 	    "$CLOSED_IS_PRESENT" != no ]]; then
 		cpkg=$SRC/../closed/pkgdefs
@@ -103,10 +103,15 @@ if [ "$o_FLAG" != "y" -a -n "$MACH" -a -n "$SRC" -a -d "$SRC/pkgdefs" ]; then
 	exc=etc/exception_list_$MACH
 	if [ "$X_FLAG" = "y" ]; then
 		ipkg=$IA32_IHV_WS/usr/src/pkgdefs
-		bpkgargs="-e $ipkg/$exc $ipkg"
+		bpkgargs="-e $bpkg/$exc -e $ipkg/$exc $bpkg $ipkg"
 	else
 		bpkgargs=""
 	fi
+# boot/solaris/boot.bin is in $SRC/pkgdefs/SUNWcar.i, rather than in
+# $SRC/realmode/pkgdefs, so the boot build needs to read both sources of
+# packaging.
+# usr/lib/fs/ufs/mboot and a few friends are in $SRC/realmode/pkgdefs,
+# so the regular build also needs this packaging data.
 	mkbfu	-f "cpiotranslate -e $pkg/$exc $bpkgargs $pkg $cpkg" \
 		$zflag $ROOT $CPIODIR
 else
diff --git a/usr/src/tools/scripts/nightly.1 b/usr/src/tools/scripts/nightly.1
index 15c46d7e06..9d99d486d4 100644
--- a/usr/src/tools/scripts/nightly.1
+++ b/usr/src/tools/scripts/nightly.1
@@ -57,7 +57,7 @@ perform a "make clobber" to clean up old binaries
 .TP
 bringover from the identified parent gate/clone
 .TP
-perform non-DEBUG and DEBUG builds
+perform non-debug and debug builds
 .TP
 list proto area files and compare with previous list
 .TP
@@ -185,13 +185,10 @@ Do not report warnings (for freeware gate ONLY)
 .TP
 .B \-w
 Report which proto area objects differ between this and the last build.
-See wsdiff(1) for details. Note that unless $SINGLE_PROTO is set to "no",
-the proto areas used for comparison are the last ones constructed as part
-of the build. As an example, if both a non-DEBUG and DEBUG build are
-performed (in that order), then the DEBUG proto area will be used for
-comparison (which might not be what you want).  If $SINGLE_PROTO is set to
-"no", then wsdiff will report on the non-DEBUG proto area as well as on the
-DEBUG proto area.
+See wsdiff(1) for details. Note that the proto areas used for comparison
+are the last ones constructed as part of the build. As an example, if both
+a non-debug and debug build are performed (in that order), then the debug
+proto area will be used for comparison (which might not be what you want).
 .LP
 .B Groups of options
 .TP 10
@@ -211,12 +208,8 @@ Default group of options for building a release (-mp)
 set the build version string to VERS, overriding VERSION
 .TP
 .B \-X
-Copies the proto area and packages from the IHV and IHV-bin gates into the
-nightly proto and package areas.  This is only available on i386.  See
-.B REALMODE ENVIRONMENT VARIABLES
-and
-.B BUILDING THE IHV WORKSPACE
-below.
+do IA32 realmode builds (requires access to a
+properly-configured NT build machine and root permissions)
 .TP
 .B \-S E | D | H
 Build the Export, Domestic, or Hybrid source product. Only Export and
@@ -351,7 +344,7 @@ set this for you.
 .RE
 .B RELEASE_BUILD
 .RS 5
-Define this to build a release with a non-DEBUG kernel. 
+Define this to build a release with a non-debug kernel. 
 Generally, let
 .I nightly
 set this for you based on its options.
@@ -466,19 +459,18 @@ available, although these are not stable, and should be checked before use.
 The command output will be appended to the mail message and log file.
 .RE
 .LP
-.B SINGLE_PROTO
-.RS 5
-By default, the DEBUG build will overwrite the non-DEBUG proto area, if
-both builds are performed.  If SINGLE_PROTO is set to "no", then the
-non-DEBUG proto area from the build will be preserved adjacent to the DEBUG
-proto area with the "-nd" tag appended to the name.
-.RE
-.LP
 .SH REALMODE ENVIRONMENT VARIABLES
 .LP
 The following environment variables referenced by
 .I nightly
-are only required when the -X option is used.
+are only required on IA32 realmode builds, enabled with option -X.
+.LP
+.B NTSERVER
+.RS 5
+The host name of the NT server to be used for realmode builds.
+It is unlikely there will be any public NT machines available,
+so you'll most likely need to set one of these up for your project's
+use if you need to build realmode.
 .LP
 .RE
 .B IA32_IHV_WS
@@ -495,20 +487,55 @@ The IHV workspace must be fully built before starting the ON realmode build.
 .RE
 .B IA32_IHV_PKGS
 .RS 5
-Reference to the IHV workspace packages.  If this is empty or the directory
-is non-existent, then nightly will skip copying the packages.
+Reference to the IHV workspace packages.
+The IHV workspace must be fully built before starting the ON realmode build.
 .LP
 .RE
 .B IA32_IHV_BINARY_PKGS
 .RS 5
-Reference to binary-only IHV packages.  If this is empty or the directory
-is non-existent, then nightly will skip copying the packages.
+Reference to binary-only IHV packages.  These packages must
+be available before starting the ON realmode build.
+.LP
+.RE
+.B DCB_ROOT
+.RS 5
+The DCB proto area containing all the individual realmode
+drivers used to construct the boot floppy.
+.LP
+.RE
+.B BOOTFLOPPY_ROOT
+.RS 5
+Boot floppy proto area containing the actual boot floppy image
+resulting from the build.
 .LP
 .RE
 .B SPARC_RM_PKGARCHIVE
 .RS 5
 Destination for sparc realmode package SUNWrmodu.
 Yes, this sparc package really is built on x86.
+.LP
+.RE
+.B REF_PROTO_LIST_DCB
+.RS 5
+This is the reference DCB proto area to compare against
+the results of your build.  This makes it easy to see
+the changes introduced from one build to the next.
+.LP
+.RE
+.B REF_PROTO_LIST_BOOTFLOPPY
+.RS 5
+This is the reference BootFloppy proto area to compare against
+the results of your build.  This makes it easy to see
+the changes introduced from one build to the next.
+.SH REALMODE BUILDS
+.LP
+Since realmode builds are always non-DEBUG, there's no difference
+between the DEBUG & non-DEBUG versions of the realmode packages.
+All the realmode and IHV packages are installed by
+.I nightly
+in both the nightly and nightly-nd
+packages so both sets of packages are complete.
+This means both the IHV and ON builds must include non-DEBUG.
 .SH BUILDING THE IHV WORKSPACE
 .LP
 The IHV workspace can be built with
@@ -519,8 +546,11 @@ The recommended options are:
 NIGHTLY_OPTIONS="-pmWN"
 .RE
 .LP
-None of the realmode environment variables needed for ON realmode builds
-are required to build the IHV workspace.
+The NTSERVER variable must be set to provide the NT server
+to be used for the realmode part of the IHV build.  None
+of the other realmode environment variables needed for
+ON realmode builds are required to build the IHV
+workspace.
 .SH EXAMPLES
 .LP
 Start with the example file in usr/src/tools/env/developer.sh
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index 18d58bd740..63a3320e35 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -337,13 +337,6 @@ build() {
 		mv $SRC/${OLDNOISE}.out $SRC/${NOISE}.ref
 	fi
 
-	if [[ "$SINGLE_PROTO" != "yes" ]]; then
-		ROOT=$ROOT$SUFFIX
-	fi
-
-	ENVLDLIBS1="-L$ROOT/lib -L$ROOT/usr/lib"
-	ENVCPPFLAGS1="-I$ROOT/usr/include"
-
 	this_build_ok=y
 	#
 	#	Build OS-Networking source
@@ -622,39 +615,19 @@ dolint() {
 
 copy_ihv_proto() {
 
-	echo "\n==== Installing IHV_ROOT ====\n" \
+	echo "\n==== Installing $IA32_IHV_ROOT  ====\n" \
 		>> $LOGFILE
 	if [ -d "$IA32_IHV_ROOT" ]; then
 		if [ ! -d "$ROOT" ]; then
 			echo "mkdir -p $ROOT" >> $LOGFILE
 			mkdir -p $ROOT
 		fi
-		echo "copying $IA32_IHV_ROOT to $ROOT\n" >> $LOGFILE
+		echo "cd $IA32_IHV_ROOT\n" >> $LOGFILE
 		cd $IA32_IHV_ROOT
 		tar -cf - . | (cd $ROOT; umask 0; tar xpf - ) 2>&1 >> $LOGFILE
 	else
 		echo "$IA32_IHV_ROOT: not found" >> $LOGFILE
 	fi
-
-	if [ "$SINGLE_PROTO" = "no" ]; then
-		if [ ! -d "$ROOT-nd" ]; then
-			echo "mkdir -p $ROOT-nd" >> $LOGFILE
-			mkdir -p $ROOT-nd
-		fi
-		# If there's a non-debug version of the IHV proto area,
-		# copy it, but copy something if there's not.
-		if [ -d "$IA32_IHV_ROOT-nd" ]; then
-			echo "copying $IA32_IHV_ROOT-nd to $ROOT-nd \n" >> $LOGFILE
-			cd $IA32_IHV_ROOT-nd
-		elif [ -d "$IA32_IHV_ROOT" ]; then
-			echo "copying $IA32_IHV_ROOT to $ROOT-nd\n" >> $LOGFILE
-			cd $IA32_IHV_ROOT
-		else
-			echo "$IA32_IHV_ROOT{-nd,}: not found" >> $LOGFILE
-			return
-		fi
-		tar -cf - . | (cd $ROOT-nd; umask 0; tar xpf - ) 2>&1 >> $LOGFILE
-	fi
 }
 
 # Install IHV packages in PKGARCHIVE
@@ -1055,13 +1028,6 @@ if [ "$BRINGOVER_FILES" = "" ]; then
 fi
 
 #
-# If SINGLE_PROTO was not specified, default to a single proto area
-#
-if [ "$SINGLE_PROTO" = "" ]; then
-	SINGLE_PROTO="yes"
-fi
-
-#
 # If the closed sources are not present, the closed binaries must be
 # present for the build to succeed.  If there's no pointer to the
 # closed binaries, flag that now, rather than forcing the user to wait
@@ -1223,7 +1189,7 @@ POUND_SIGN="#"
 
 # we export POUND_SIGN to speed up the build process -- prevents evaluation of
 # the Makefile.master definitions.
-export o_FLAG X_FLAG POUND_SIGN
+export o_FLAG POUND_SIGN
 
 maketype="distributed"
 MAKE=dmake
@@ -1325,14 +1291,6 @@ if [ "$X_FLAG" = "y" ]; then
                 echo "$IA32_IHV_ROOT: not found"
                 args_ok=n
         fi
-        if [ "$IA32_IHV_WS" = "" ]; then
-		echo "IA32_IHV_WS: must be set for copying ihv proto"
-		args_ok=n
-        fi
-        if [ ! -d "$IA32_IHV_WS" ]; then
-                echo "$IA32_IHV_WS: not found"
-                args_ok=n
-        fi
 fi
 
 # Append source version
@@ -1441,10 +1399,6 @@ logshuffle() {
 		if [ -f $TMPDIR/wsdiff.results ]; then
 		    mv $TMPDIR/wsdiff.results $LLOG
 		fi
-
-		if [ -f $TMPDIR/wsdiff-nd.results ]; then
-		    mv $TMPDIR/wsdiff-nd.results $LLOG
-		fi
 	fi
 
 	#
@@ -1723,6 +1677,14 @@ if [ "$t_FLAG" = "n" ]; then
 	fi
 fi
 
+# copy ihv proto area in addition to the build itself
+
+if [ "$X_FLAG" = "y" ]; then
+
+	# Install IA32 IHV proto area
+	copy_ihv_proto
+fi
+
 echo "==== Build environment ====\n" | tee -a $mail_msg_file >> $LOGFILE
 
 # System
@@ -1809,14 +1771,6 @@ if [ "$w_FLAG" = "y" -a -d "$ROOT" ]; then
     mv $ROOT $ROOT.prev
 fi
 
-# Same for non-DEBUG proto area
-if [ "$w_FLAG" = "y" -a "$SINGLE_PROTO" = "no" -a -d "$ROOT-nd" ]; then
-	if [ -d "$ROOT-nd.prev" ]; then
-		rm -rf $ROOT-nd.prev
-	fi
-	mv $ROOT-nd $ROOT-nd.prev
-fi
-
 #
 #	Decide whether to clobber
 #
@@ -1853,7 +1807,7 @@ if [ "$i_FLAG" = "n" -a -d "$SRC" ]; then
 		mkdir -p ${TOOLS_PROTO}
 	fi
 
-	rm -rf $ROOT $ROOT-nd
+	rm -rf $ROOT
 
 	# Get back to a clean workspace as much as possible to catch
 	# problems that only occur on fresh workspaces.
@@ -1927,13 +1881,6 @@ if [ "$t_FLAG" = "y" ]; then
 	build_tools ${TOOLS_PROTO}
 fi
 
-#
-# copy ihv proto area in addition to the build itself
-#
-if [ "$X_FLAG" = "y" ]; then
-	copy_ihv_proto
-fi
-
 if [ "$i_FLAG" = "y" -a "$SH_FLAG" = "y" ]; then
 	echo "\n==== NOT Building base OS-Net source ====\n" | \
 	    tee -a $LOGFILE >> $mail_msg_file
@@ -1991,7 +1938,7 @@ fi
 
 if [ "$SE_FLAG" = "y" -o "$SD_FLAG" = "y" -o "$SH_FLAG" = "y" ]; then
 	# remove proto area here, since we don't clobber
-	rm -rf "$ROOT" "$ROOT-nd"
+	rm -rf "$ROOT"
 	if [ "$t_FLAG" = "y" ]; then
 		export INTERNAL_RELEASE_BUILD ; INTERNAL_RELEASE_BUILD=
 		export RELEASE_BUILD ; RELEASE_BUILD=
@@ -2024,9 +1971,6 @@ if [ "$build_ok" = "y" ]; then
 		if [ -f $SRC/pkgdefs/$exc ]; then
 			ELIST="-e $SRC/pkgdefs/$exc"
 		fi
-		if [ "$X_FLAG" = "y" -a -f $IA32_IHV_WS/usr/src/pkgdefs/$exc ]; then
-			ELIST="$ELIST -e $IA32_IHV_WS/usr/src/pkgdefs/$exc"
-		fi
 
 		if [ -f "$REF_PROTO_LIST" ]; then
 			$PROTOCMPTERSE \
@@ -2047,9 +1991,6 @@ if [ "$build_ok" = "y" ]; then
 				PKGDEFS_LIST="$PKGDEFS_LIST -d $d/pkgdefs"
 			fi
 		done
-		if [ "$X_FLAG" = "y" -a -d $IA32_IHV_WS/usr/src/pkgdefs ]; then
-			PKGDEFS_LIST="$PKGDEFS_LIST -d $IA32_IHV_WS/usr/src/pkgdefs"
-		fi
 
 		$PROTOCMPTERSE \
 		    "Files missing from the proto area:" \
@@ -2096,13 +2037,6 @@ if [ "$U_FLAG" = "y" -a "$build_ok" = "y" ]; then
 	cd $ROOT
 	( tar cf - . | ( cd $NIGHTLY_PARENT_ROOT;  umask 0; tar xpf - ) ) 2>&1 |
 		tee -a $mail_msg_file >> $LOGFILE
-	if [ "$SINGLE_PROTO" = "no" ]; then
-		mkdir -p $NIGHTLY_PARENT_ROOT-nd
-		cd $ROOT-nd
-		( tar cf - . |
-			( cd $NIGHTLY_PARENT_ROOT-nd; umask 0; tar xpf - ) ) 2>&1 |
-			tee -a $mail_msg_file >> $LOGFILE
-	fi
 fi
 
 #
@@ -2319,30 +2253,15 @@ if [ "$M_FLAG" != "y" -a "$build_ok" = y ]; then
 fi
 
 if [ "$w_FLAG" = "y" -a "$build_ok" = "y" ]; then
-	echo "\n==== Objects that differ since last build ====\n" |
-		tee -a $LOGFILE >> $mail_msg_file
+	echo "\n==== Objects that differ since last build ====\n" | \
+	    tee -a $LOGFILE >> $mail_msg_file
 
 	if [ "$t_FLAG" = "y" ]; then
-		wsdiff -t -r ${TMPDIR}/wsdiff.results $ROOT.prev $ROOT |
-			tee -a $LOGFILE >> $mail_msg_file
+	    wsdiff -t -r ${TMPDIR}/wsdiff.results $ROOT.prev $ROOT | \
+		tee -a $LOGFILE >> $mail_msg_file
 	else
-		wsdiff -r ${TMPDIR}/wsdiff.results $ROOT.prev $ROOT  |
-			tee -a $LOGFILE >> $mail_msg_file
-	fi
-
-	if [ "$SINGLE_PROTO" = "no" ]; then
-		echo "\n==== Objects that differ since last build (non-DEBUG) ====\n" |
-			tee -a $LOGFILE >> $mail_msg_file
-
-		if [ "$t_FLAG" = "y" ]; then
-			wsdiff -t -r ${TMPDIR}/wsdiff-nd.results \
-				$ROOT-nd.prev $ROOT-nd |
-					tee -a $LOGFILE >> $mail_msg_file
-		else
-			wsdiff -r ${TMPDIR}/wsdiff-nd.results \
-				$ROOT-nd.prev $ROOT-nd |
-					tee -a $LOGFILE >> $mail_msg_file
-		fi
+	    wsdiff -r ${TMPDIR}/wsdiff.results $ROOT.prev $ROOT  | \
+		tee -a $LOGFILE >> $mail_msg_file
 	fi
 fi