6366785 nightly doesn't handle transition from pre-split to split workspace

24 files changed, 39 insertions, 231 deletions

diff --git a/usr/src/cmd/perl/5.6.1/req.flg b/usr/src/cmd/perl/5.6.1/req.flg
index 60b9dbb76b..c38c83d8c1 100644
--- a/usr/src/cmd/perl/5.6.1/req.flg
+++ b/usr/src/cmd/perl/5.6.1/req.flg
@@ -12,7 +12,6 @@
 #
 
 find_files "s.*" usr/src/cmd/perl/contrib
-find_files "s.*" usr/closed/cmd/perl/contrib
 echo_file usr/src/lib/Makefile.lib
 echo_file usr/src/lib/Makefile.targ
 find_files "s.*" usr/src/lib/common
diff --git a/usr/src/cmd/perl/5.8.4/req.flg b/usr/src/cmd/perl/5.8.4/req.flg
index 60b9dbb76b..c38c83d8c1 100644
--- a/usr/src/cmd/perl/5.8.4/req.flg
+++ b/usr/src/cmd/perl/5.8.4/req.flg
@@ -12,7 +12,6 @@
 #
 
 find_files "s.*" usr/src/cmd/perl/contrib
-find_files "s.*" usr/closed/cmd/perl/contrib
 echo_file usr/src/lib/Makefile.lib
 echo_file usr/src/lib/Makefile.targ
 find_files "s.*" usr/src/lib/common
diff --git a/usr/src/cmd/sgs/packages/inc.flg b/usr/src/cmd/sgs/packages/inc.flg
index 5d25dccab1..c72d3c1243 100644
--- a/usr/src/cmd/sgs/packages/inc.flg
+++ b/usr/src/cmd/sgs/packages/inc.flg
@@ -74,7 +74,6 @@ echo_file usr/src/head/rtld_db.h
 echo_file usr/src/head/apptrace.h
 echo_file usr/src/head/apptrace_impl.h
 echo_file usr/src/uts/common/sys/Makefile
-echo_file usr/closed/uts/common/sys/Makefile
 echo_file usr/src/uts/Makefile.uts
 echo_file usr/src/uts/common/krtld/reloc.h
 echo_file usr/src/uts/common/sys/Makefile.syshdrs
diff --git a/usr/src/lib/libc/req.flg b/usr/src/lib/libc/req.flg
index ed6e6b4c12..9fad6cfb0e 100644
--- a/usr/src/lib/libc/req.flg
+++ b/usr/src/lib/libc/req.flg
@@ -28,4 +28,3 @@
 
 find_files "s.*" usr/src/common/atomic
 find_files "s.*" usr/src/common/util
-find_files "s.*" usr/closed/lib/libc_i18n
diff --git a/usr/src/lib/pkcs11/inc.flg b/usr/src/lib/pkcs11/inc.flg
index d4c71f83ff..3577611f27 100644
--- a/usr/src/lib/pkcs11/inc.flg
+++ b/usr/src/lib/pkcs11/inc.flg
@@ -30,5 +30,3 @@ find_files "s.*" usr/src/common/crypto
 find_files "s.*" usr/src/common/bignum
 find_files "s.*" usr/src/lib/libldap5/sources/ldap/ber
 find_files "s.*" usr/src/lib/libldap5/include/ldap
-echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnet
-echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnet
diff --git a/usr/src/psm/stand/boot/inc.flg b/usr/src/psm/stand/boot/inc.flg
index b66daca53c..87b058d63e 100644
--- a/usr/src/psm/stand/boot/inc.flg
+++ b/usr/src/psm/stand/boot/inc.flg
@@ -33,13 +33,10 @@
 find_files "s.*.h"\
         usr/src/uts/sparc\
         usr/src/uts/sun\
-        usr/closed/uts/sun\
         usr/src/uts/common/sys\
-        usr/closed/uts/common/sys\
         usr/src/uts/common/vm\
         usr/src/uts/common/rpc\
         usr/src/uts/common/nfs\
-        usr/closed/uts/common/nfs\
         usr/src/stand/sys
 #
 # Get required directories
diff --git a/usr/src/req.flg b/usr/src/req.flg
index cdd2608b66..6df1878536 100644
--- a/usr/src/req.flg
+++ b/usr/src/req.flg
@@ -37,7 +37,3 @@ echo_file usr/src/xmod/xmod_files
 echo_file usr/src/tools/abi/etc/ABI_sparc.db
 echo_file usr/src/tools/abi/etc/ABI_i386.db
 echo_file usr/src/tools/abi/etc/exceptions
-echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnet
-echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetSolaris
-echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnet
-echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetSolaris
diff --git a/usr/src/stand/lib/req.flg b/usr/src/stand/lib/req.flg
index 29780d923f..0992d1f74c 100644
--- a/usr/src/stand/lib/req.flg
+++ b/usr/src/stand/lib/req.flg
@@ -34,4 +34,3 @@ echo_file usr/src/psm/Makefile.psm.64
 find_files "s.*.h" usr/src/psm/stand/sys
 find_files "s.*.h" usr/src/stand
 find_files "s.*.h" usr/src/uts
-find_files "s.*.h" usr/closed/uts
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index 15b9bbaee7..23596160ad 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -766,6 +766,32 @@ staffer() {
 	fi
 }
 
+#
+# Verify that the closed tree is present if it needs to be.
+# Sets CLOSED_IS_PRESENT for future use.
+#
+check_closed_tree() {
+	if [ -z "$CLOSED_IS_PRESENT" ]; then
+		if [ -d $SRC/../closed ]; then
+			CLOSED_IS_PRESENT="yes"
+		else
+			CLOSED_IS_PRESENT="no"
+		fi
+		export CLOSED_IS_PRESENT
+	fi
+	if [[ "$CLOSED_IS_PRESENT" = no && ! -d "$ON_CLOSED_BINS" ]]; then
+		#
+		# If it's an old (pre-split) tree or an empty
+		# workspace, don't complain.
+		#
+		if grep -s CLOSED_BUILD $SRC/Makefile.master > /dev/null; then
+			echo "If the closed sources are not present," \
+			    "ON_CLOSED_BINS"
+			echo "must point to the closed binaries tree."
+			exit 1
+		fi
+	fi
+}
 
 MACH=`uname -p`
 
@@ -1018,41 +1044,14 @@ if [ "$BRINGOVER_FILES" = "" ]; then
 	BRINGOVER_FILES="usr"
 fi
 
-if [ -z "$CLOSED_IS_PRESENT" ]; then
-	#
-	# See if the closed tree is present.  If the current workspace
-	# is empty, check the bringover workspace.  (This is for
-	# builds that start out with nothing but the environment
-	# file.)
-	#
-	if [ -d $SRC/../closed ]; then
-		CLOSED_IS_PRESENT="yes"
-	elif [ -d $SRC ]; then
-		CLOSED_IS_PRESENT="no"
-	elif [ -d $CLONE_WS/usr/closed ]; then
-		CLOSED_IS_PRESENT="yes"
-	else
-		CLOSED_IS_PRESENT="no"
-	fi
-	export CLOSED_IS_PRESENT
-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
 # a couple hours (or more) to find out.
 #
-if [[ "$CLOSED_IS_PRESENT" = no && ! -d "$ON_CLOSED_BINS" ]]; then
-	#
-	# If it's an old (pre-split) tree, don't complain.
-	#
-	if grep CLOSED_BUILD $SRC/Makefile.master > /dev/null; then
-		echo "If the closed sources are not present, ON_CLOSED_BINS"
-		echo "must point to the closed binaries tree."
-		exit 1
-	fi
-fi
+orig_closed_is_present="$CLOSED_IS_PRESENT"
+check_closed_tree
 
 #
 # Note: changes to the option letters here should also be applied to the
@@ -1837,6 +1836,13 @@ if [ "$n_FLAG" = "n" ]; then
 		echo "trouble with bringover, quitting at `date`." >> $LOGFILE
 		exit 1
 	fi
+
+	#
+	# Possible transition from pre-split workspace to split
+	# workspace.  See if the bringover changed anything.
+	#
+	CLOSED_IS_PRESENT="$orig_closed_is_present"
+	check_closed_tree
 else
 	echo "\n==== No bringover to $CODEMGR_WS ====\n" >> $LOGFILE
 fi
diff --git a/usr/src/uts/common/io/1394/inc.flg b/usr/src/uts/common/io/1394/inc.flg
index f37d55da46..7519eaa338 100644
--- a/usr/src/uts/common/io/1394/inc.flg
+++ b/usr/src/uts/common/io/1394/inc.flg
@@ -38,9 +38,6 @@ find_files "s.*.h"	\
 	usr/src/uts/common/sys
 
 find_files "s.*.h"	\
-	usr/closed/uts/common/sys
-
-find_files "s.*.h"	\
 	usr/src/uts/sparc/sys 
 
 find_files "s.*.h"	\
@@ -53,15 +50,9 @@ find_files "s.*.h"	\
 	usr/src/uts/sun/sys 
 
 find_files "s.*.h"	\
-	usr/closed/uts/sun/sys 
-
-find_files "s.*.h"	\
 	usr/src/uts/sun4u/sys 
 
 find_files "s.*.h"	\
-	usr/closed/uts/sun4u/sys 
-
-find_files "s.*.h"	\
 	usr/src/uts/common/vm 
 
 find_files "s.*"	\
@@ -78,14 +69,9 @@ echo_file  usr/src/uts/Makefile.targ
 echo_file  usr/src/uts/Makefile.uts
 echo_file  usr/src/uts/sun/Makefile.files
 echo_file  usr/src/uts/sun/Makefile.rules
-echo_file  usr/closed/uts/sun/Makefile.files
-echo_file  usr/closed/uts/sun/Makefile.rules
 echo_file  usr/src/uts/common/Makefile.files
 echo_file  usr/src/uts/common/Makefile.rules
 echo_file  usr/src/uts/common/sys/Makefile
-echo_file  usr/closed/uts/common/Makefile.files
-echo_file  usr/closed/uts/common/Makefile.rules
-echo_file  usr/closed/uts/common/sys/Makefile
 echo_file  usr/src/uts/sparc/Makefile
 echo_file  usr/src/uts/sparc/Makefile.files
 echo_file  usr/src/uts/sparc/Makefile.rules
@@ -93,8 +79,6 @@ echo_file  usr/src/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.sparc.shared
 echo_file  usr/src/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/Makefile.targ.shared
-echo_file  usr/closed/uts/sparc/Makefile.sparc
-echo_file  usr/closed/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/ml/sparc.il
 echo_file  usr/src/uts/sparc/req.flg
 
diff --git a/usr/src/uts/common/io/audio/inc.flg b/usr/src/uts/common/io/audio/inc.flg
index 0df192aade..fc5779d59b 100644
--- a/usr/src/uts/common/io/audio/inc.flg
+++ b/usr/src/uts/common/io/audio/inc.flg
@@ -38,9 +38,6 @@ find_files "s.*.h"	\
 	usr/src/uts/common/sys
 
 find_files "s.*.h"	\
-	usr/closed/uts/common/sys
-
-find_files "s.*.h"	\
 	usr/src/uts/sparc/sys
 
 find_files "s.*.h"	\
@@ -53,9 +50,6 @@ find_files "s.*.h"	\
 	usr/src/uts/intel/sys
 
 find_files "s.*.h"	\
-	usr/closed/uts/intel/sys
-
-find_files "s.*.h"	\
 	usr/src/uts/intel/ia32/sys
 
 find_files "s.*"	\
@@ -65,15 +59,9 @@ find_files "s.*.h"	\
 	usr/src/uts/sun/sys
 
 find_files "s.*.h"	\
-	usr/closed/uts/sun/sys
-
-find_files "s.*.h"	\
 	usr/src/uts/i86pc/sys
 
 find_files "s.*.h"	\
-	usr/closed/uts/i86pc/sys
-
-find_files "s.*.h"	\
 	usr/src/uts/common/vm
 
 find_files "s.*"	\
@@ -85,26 +73,17 @@ find_files "s.*"	\
 find_files "s.*"	\
 	usr/src/uts/sparc/warlock	\
 	usr/src/uts/sparc/audiocs	\
-	usr/closed/uts/sparc/audioens	\
 	usr/src/uts/sparc/audiots	\
 	usr/src/uts/sparc/audio810	\
-	usr/closed/uts/sparc/audiovia823x	\
 	usr/src/uts/sparc/audio1575	\
 	usr/src/uts/sparc/audiosup	\
 	usr/src/uts/sparc/mixer		\
-	usr/closed/uts/sparc/amsrc1	\
 	usr/src/uts/sparc/amsrc2	\
 	usr/src/uts/sparc/diaudio	\
-	usr/closed/uts/i86pc/audioens	\
 	usr/src/uts/i86pc/audio810	\
-	usr/closed/uts/i86pc/audiovia823x	\
 	usr/src/uts/intel/audiosup	\
 	usr/src/uts/intel/mixer		\
-	usr/closed/uts/intel/amsrc1	\
-	usr/src/uts/intel/diaudio	\
-
-find_files "s.*"        \
-	usr/closed/uts/sun4u/forthdebug
+	usr/src/uts/intel/diaudio
 
 echo_file usr/src/uts/sparc/os/driver_classes
 echo_file usr/src/uts/sparc/os/driver_aliases
@@ -122,44 +101,30 @@ echo_file  usr/src/uts/Makefile
 echo_file  usr/src/uts/Makefile.targ
 echo_file  usr/src/uts/Makefile.uts
 echo_file  usr/src/uts/sun/Makefile.files
-echo_file  usr/closed/uts/sun/Makefile.files
 echo_file  usr/src/uts/sun/Makefile.rules
-echo_file  usr/closed/uts/sun/Makefile.rules
 echo_file  usr/src/uts/common/Makefile.files
-echo_file  usr/closed/uts/common/Makefile.files
 echo_file  usr/src/uts/common/Makefile.rules
-echo_file  usr/closed/uts/common/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile
 echo_file  usr/src/uts/sparc/Makefile.files
 echo_file  usr/src/uts/sparc/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.sparc.shared
-echo_file  usr/closed/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/Makefile.targ.shared
-echo_file  usr/closed/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/req.flg
 echo_file  usr/src/uts/i86pc/Makefile.i86pc
 echo_file  usr/src/uts/i86pc/Makefile.i86pc.shared
-echo_file  usr/closed/uts/i86pc/Makefile.i86pc
 echo_file  usr/src/uts/i86pc/Makefile.files
-echo_file  usr/closed/uts/i86pc/Makefile.files
 echo_file  usr/src/uts/i86pc/Makefile.rules
-echo_file  usr/closed/uts/i86pc/Makefile.rules
 echo_file  usr/src/uts/i86pc/Makefile.targ
 echo_file  usr/src/uts/i86pc/Makefile.targ.shared
-echo_file  usr/closed/uts/i86pc/Makefile.targ
 echo_file  usr/src/uts/i86pc/Makefile.workarounds
 echo_file  usr/src/uts/intel/Makefile
 echo_file  usr/src/uts/intel/Makefile.files
-echo_file  usr/closed/uts/intel/Makefile.files
 echo_file  usr/src/uts/intel/Makefile.rules
-echo_file  usr/closed/uts/intel/Makefile.rules
 echo_file  usr/src/uts/intel/Makefile.intel
 echo_file  usr/src/uts/intel/Makefile.intel.shared
-echo_file  usr/closed/uts/intel/Makefile.intel
 echo_file  usr/src/uts/intel/Makefile.targ
 echo_file  usr/src/uts/intel/Makefile.targ.shared
-echo_file  usr/closed/uts/intel/Makefile.targ
 echo_file  usr/src/uts/intel/ia32/Makefile.rules
 echo_file  usr/src/uts/intel/amd64/Makefile.rules
diff --git a/usr/src/uts/common/io/ib/inc.flg b/usr/src/uts/common/io/ib/inc.flg
index f63b4def47..246076a9a1 100644
--- a/usr/src/uts/common/io/ib/inc.flg
+++ b/usr/src/uts/common/io/ib/inc.flg
@@ -34,16 +34,12 @@
 # header files
 find_files "s.*.h"	\
 	usr/src/uts/common/sys/ib	\
-	usr/closed/uts/common/sys/ib	\
 	usr/src/uts/common/sys		\
-	usr/closed/uts/common/sys		\
 	usr/src/uts/sparc/sys		\
 	usr/src/uts/sparc/v7/sys	\
 	usr/src/uts/sparc/v9/sys	\
 	usr/src/uts/sun/sys		\
-	usr/closed/uts/sun/sys		\
 	usr/src/uts/intel/sys		\
-	usr/closed/uts/intel/sys		\
 	usr/src/uts/intel/ia32/sys	\
 	usr/src/uts/common/rpc		\
 	usr/src/uts/common/netinet	\
@@ -67,18 +63,14 @@ find_files "s.*"	\
 	usr/src/uts/sparc/ibdm		\
 	usr/src/uts/sparc/ibmf		\
 	usr/src/uts/sparc/ibtl		\
-	usr/closed/uts/sparc/tavor	\
 	usr/src/uts/sparc/ibd		\
-	usr/closed/uts/sparc/daplt	\
 	usr/src/uts/sparc/rpcib		\
 	usr/src/uts/intel/ib		\
 	usr/src/uts/intel/ibcm		\
 	usr/src/uts/intel/ibdm		\
 	usr/src/uts/intel/ibmf		\
 	usr/src/uts/intel/ibtl		\
-	usr/closed/uts/intel/tavor	\
 	usr/src/uts/intel/ibd		\
-	usr/closed/uts/intel/daplt		\
 	usr/src/uts/intel/rpcib	
 
 # packaging files
@@ -108,52 +100,37 @@ echo_file  usr/src/uts/Makefile
 echo_file  usr/src/uts/Makefile.targ
 echo_file  usr/src/uts/Makefile.uts
 echo_file  usr/src/uts/sun/Makefile.files
-echo_file  usr/closed/uts/sun/Makefile.files
 echo_file  usr/src/uts/sun/Makefile.rules
-echo_file  usr/closed/uts/sun/Makefile.rules
 echo_file  usr/src/uts/common/Makefile.files
-echo_file  usr/closed/uts/common/Makefile.files
 echo_file  usr/src/uts/common/Makefile.rules
-echo_file  usr/closed/uts/common/Makefile.rules
 echo_file  usr/src/uts/common/sys/Makefile
-echo_file  usr/closed/uts/common/sys/Makefile
 echo_file  usr/src/uts/common/sys/lvm/Makefile
 echo_file  usr/src/uts/sparc/Makefile
 echo_file  usr/src/uts/sparc/Makefile.files
 echo_file  usr/src/uts/sparc/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.sparc.shared
-echo_file  usr/closed/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/Makefile.targ.shared
-echo_file  usr/closed/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/ml/sparc.il
 echo_file  usr/src/uts/sparc/req.flg
 echo_file  usr/src/uts/intel/Makefile
 echo_file  usr/src/uts/intel/Makefile.files
-echo_file  usr/closed/uts/intel/Makefile.files
 echo_file  usr/src/uts/intel/Makefile.rules
-echo_file  usr/closed/uts/intel/Makefile.rules
 echo_file  usr/src/uts/intel/Makefile.intel
 echo_file  usr/src/uts/intel/Makefile.intel.shared
-echo_file  usr/closed/uts/intel/Makefile.intel
 echo_file  usr/src/uts/intel/Makefile.targ
 echo_file  usr/src/uts/intel/Makefile.targ.shared
-echo_file  usr/closed/uts/intel/Makefile.targ
 echo_file  usr/src/uts/intel/ia32/ml/ia32.il
 echo_file  usr/src/uts/sun4/Makefile.files
 echo_file  usr/src/uts/sun4/Makefile.rules
 echo_file  usr/src/uts/sun4u/Makefile
 echo_file  usr/src/uts/sun4u/Makefile.files
-echo_file  usr/closed/uts/sun4u/Makefile.files
 echo_file  usr/src/uts/sun4u/Makefile.rules
-echo_file  usr/closed/uts/sun4u/Makefile.rules
 echo_file  usr/src/uts/sun4u/Makefile.sun4u
 echo_file  usr/src/uts/sun4u/Makefile.sun4u.shared
-echo_file  usr/closed/uts/sun4u/Makefile.sun4u
 echo_file  usr/src/uts/sun4u/Makefile.targ
 echo_file  usr/src/uts/sun4u/Makefile.targ.shared
-echo_file  usr/closed/uts/sun4u/Makefile.targ
 echo_file  usr/src/uts/sun4u/Makefile.workarounds
 echo_file  usr/src/uts/sfmmu/Makefile.files
 echo_file  usr/src/uts/sfmmu/Makefile.rules
@@ -173,12 +150,3 @@ echo_file  usr/src/pkgdefs/etc/exception_list_sparc
 echo_file  usr/src/pkgdefs/etc/exception_list_i386
 echo_file  usr/src/cmd/mapfile_noexstk
 echo_file  usr/src/cmd/sgs/mapfiles/sparc/map.pagealign
-
-# these files are needed for forthdebug
-echo_file  usr/closed/uts/sun4u/forthdebug/Makefile
-echo_file  usr/closed/uts/sun4u/forthdebug/ib.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ibcm.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ibdm.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ibmf.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ibtl.fdbg
-echo_file  usr/closed/uts/sun4/forthdebug/tavor.fdbg
diff --git a/usr/src/uts/common/io/usb/inc.flg b/usr/src/uts/common/io/usb/inc.flg
index fe7358bec9..1e71c0b7b3 100644
--- a/usr/src/uts/common/io/usb/inc.flg
+++ b/usr/src/uts/common/io/usb/inc.flg
@@ -35,9 +35,6 @@ find_files "s.*.h"	\
 	usr/src/uts/common/sys
 
 find_files "s.*.h"	\
-	usr/closed/uts/common/sys
-
-find_files "s.*.h"	\
 	usr/src/uts/sparc/sys 
 
 find_files "s.*.h"	\
@@ -50,15 +47,9 @@ find_files "s.*.h"	\
 	usr/src/uts/intel/sys 
 
 find_files "s.*.h"	\
-	usr/closed/uts/intel/sys 
-
-find_files "s.*.h"	\
 	usr/src/uts/sun/sys 
 
 find_files "s.*.h"	\
-	usr/closed/uts/sun/sys 
-
-find_files "s.*.h"	\
 	usr/src/uts/common/vm 
 
 find_files "s.*"	\
@@ -83,7 +74,6 @@ find_files "s.*"	\
 	usr/src/uts/sparc/usb_ah \
 	usr/src/uts/sparc/ugen \
 	usr/src/uts/sparc/usbser \
-	usr/closed/uts/sparc/usbser_edge \
 	usr/src/uts/sparc/usbsksp \
 	usr/src/uts/sparc/usbsprl \
 	usr/src/uts/sparc/usbskel \
@@ -105,7 +95,6 @@ find_files "s.*"	\
 	usr/src/uts/intel/usb_as \
 	usr/src/uts/intel/usb_ah \
 	usr/src/uts/intel/usbser \
-	usr/closed/uts/intel/usbser_edge \
 	usr/src/uts/intel/usbsksp \
 	usr/src/uts/intel/usbsprl \
 	usr/src/uts/intel/ia32 \
@@ -129,57 +118,29 @@ echo_file  usr/src/uts/Makefile
 echo_file  usr/src/uts/Makefile.targ
 echo_file  usr/src/uts/Makefile.uts
 echo_file  usr/src/uts/sun/Makefile.files
-echo_file  usr/closed/uts/sun/Makefile.files
 echo_file  usr/src/uts/sun/Makefile.rules
-echo_file  usr/closed/uts/sun/Makefile.rules
 echo_file  usr/src/uts/common/Makefile.files
-echo_file  usr/closed/uts/common/Makefile.files
 echo_file  usr/src/uts/common/Makefile.rules
-echo_file  usr/closed/uts/common/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile
 echo_file  usr/src/uts/sparc/Makefile.files
 echo_file  usr/src/uts/sparc/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.sparc.shared
-echo_file  usr/closed/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/Makefile.targ.shared
-echo_file  usr/closed/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/ml/sparc.il
 echo_file  usr/src/uts/sparc/req.flg
 echo_file  usr/src/uts/intel/Makefile
 echo_file  usr/src/uts/intel/Makefile.files
-echo_file  usr/closed/uts/intel/Makefile.files
 echo_file  usr/src/uts/intel/Makefile.rules
-echo_file  usr/closed/uts/intel/Makefile.rules
 echo_file  usr/src/uts/intel/Makefile.intel
 echo_file  usr/src/uts/intel/Makefile.intel.shared
-echo_file  usr/closed/uts/intel/Makefile.intel
 echo_file  usr/src/uts/intel/Makefile.targ
 echo_file  usr/src/uts/sparc/v9/Makefile.files
 echo_file  usr/src/uts/sparc/v9/Makefile.rules
 echo_file  usr/src/uts/sun4u/Makefile.rules
-echo_file  usr/closed/uts/sun4u/Makefile.rules
 echo_file  usr/src/uts/sun4/Makefile.rules
 echo_file  usr/src/uts/common/sys/Makefile
-echo_file  usr/closed/uts/common/sys/Makefile
 echo_file  usr/src/uts/common/os/privs.awk
 echo_file  usr/src/uts/common/os/priv_defs
 echo_file  usr/src/uts/intel/Makefile.targ.shared
-echo_file  usr/closed/uts/intel/Makefile.targ
-
-# these files are needed for forthdebug
-echo_file  usr/closed/uts/sun4u/forthdebug/Makefile
-echo_file  usr/closed/uts/sun4u/forthdebug/hid.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/hubd.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ohci.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ehci.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usb_mid.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usba.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usbkbm.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usbms.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usbser.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usbser_edge.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usbprn.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/usb_audio.fdbg
-echo_file  usr/closed/uts/sun4u/forthdebug/ugen.fdbg
diff --git a/usr/src/uts/intel/kmech_krb5/inc.flg b/usr/src/uts/intel/kmech_krb5/inc.flg
index 15653f33a3..06f25ad9b4 100644
--- a/usr/src/uts/intel/kmech_krb5/inc.flg
+++ b/usr/src/uts/intel/kmech_krb5/inc.flg
@@ -27,17 +27,14 @@
 # Use is subject to license terms.
 #
 find_files "s.*.h" usr/src/uts/common/sys
-find_files "s.*.h" usr/closed/uts/common/sys
 find_files "s.*.h" usr/src/uts/common/rpc
 find_files "s.*.h" usr/src/uts/common/gssapi
 find_files "s.*.h" usr/src/uts/common/vm
 find_files "s.*.h" usr/src/uts/common/netinet
 find_files "s.*.h" usr/src/uts/common/net
 find_files "s.*.h" usr/src/uts/intel/sys
-find_files "s.*.h" usr/closed/uts/intel/sys
 find_files "s.*.h" usr/src/uts/intel/ia32/sys
 find_files "s.*.h" usr/src/lib/krb5/kadm5
 find_files "s.*" usr/src/uts/intel/ia32/ml
 find_files "s.*" usr/src/uts/common/gssapi/mechs/krb5
 find_files "s.*" usr/src/lib/gss_mechs/mech_krb5
-find_files "s.*" usr/closed/lib/gss_mechs/mech_krb5
diff --git a/usr/src/uts/intel/kmech_krb5/req.flg b/usr/src/uts/intel/kmech_krb5/req.flg
index b1d5e2df03..b7ac8da3cf 100644
--- a/usr/src/uts/intel/kmech_krb5/req.flg
+++ b/usr/src/uts/intel/kmech_krb5/req.flg
@@ -28,16 +28,10 @@
 #
 echo_file usr/src/uts/intel/Makefile
 echo_file usr/src/uts/intel/Makefile.files
-echo_file usr/closed/uts/intel/Makefile.files
 echo_file usr/src/uts/intel/Makefile.intel
 echo_file usr/src/uts/intel/Makefile.intel.shared
-echo_file usr/closed/uts/intel/Makefile.intel
 echo_file usr/src/uts/intel/Makefile.rules
-echo_file usr/closed/uts/intel/Makefile.rules
 echo_file usr/src/uts/intel/Makefile.targ
 echo_file usr/src/uts/intel/Makefile.targ.shared
-echo_file usr/closed/uts/intel/Makefile.targ
 echo_file usr/src/uts/common/Makefile.files
-echo_file usr/closed/uts/common/Makefile.files
 echo_file usr/src/uts/common/Makefile.rules
-echo_file usr/closed/uts/common/Makefile.rules
diff --git a/usr/src/uts/req.flg b/usr/src/uts/req.flg
index 4cd20e6b90..a394b9c7d2 100644
--- a/usr/src/uts/req.flg
+++ b/usr/src/uts/req.flg
@@ -46,7 +46,6 @@ find_files "s.*" usr/src/common/avl
 # For full builds (open and closed), we want both etc/certs and
 # etc/keys.  For an open source build, there's no etc/keys directory.
 find_files "s.*" usr/src/cmd/cmd-crypto/etc
-find_files "s.*" usr/closed/cmd/cmd-crypto/etc
 find_files "s.*" usr/src/common/ipf
 find_files "s.*" usr/src/common/mdesc
 find_files "s.*" usr/src/common/fs
diff --git a/usr/src/uts/sparc/kmech_krb5/inc.flg b/usr/src/uts/sparc/kmech_krb5/inc.flg
index 56ab53d112..4f1bfa4679 100644
--- a/usr/src/uts/sparc/kmech_krb5/inc.flg
+++ b/usr/src/uts/sparc/kmech_krb5/inc.flg
@@ -27,7 +27,6 @@
 # Use is subject to license terms.
 #
 find_files "s.*.h" usr/src/uts/common/sys
-find_files "s.*.h" usr/closed/uts/common/sys
 find_files "s.*.h" usr/src/uts/common/rpc
 find_files "s.*.h" usr/src/uts/common/gssapi
 find_files "s.*.h" usr/src/uts/common/vm
@@ -40,4 +39,3 @@ find_files "s.*.h" usr/src/lib/krb5/kadm5
 find_files "s.*" usr/src/uts/sparc/ml
 find_files "s.*" usr/src/uts/common/gssapi/mechs/krb5
 find_files "s.*" usr/src/lib/gss_mechs/mech_krb5
-find_files "s.*" usr/closed/lib/gss_mechs/mech_krb5
diff --git a/usr/src/uts/sparc/kmech_krb5/req.flg b/usr/src/uts/sparc/kmech_krb5/req.flg
index f6b7cb3c33..4f0f1b4b90 100644
--- a/usr/src/uts/sparc/kmech_krb5/req.flg
+++ b/usr/src/uts/sparc/kmech_krb5/req.flg
@@ -30,12 +30,8 @@ echo_file usr/src/uts/sparc/Makefile
 echo_file usr/src/uts/sparc/Makefile.files
 echo_file usr/src/uts/sparc/Makefile.sparc
 echo_file usr/src/uts/sparc/Makefile.sparc.shared
-echo_file usr/closed/uts/sparc/Makefile.sparc
 echo_file usr/src/uts/sparc/Makefile.rules
 echo_file usr/src/uts/sparc/Makefile.targ
 echo_file usr/src/uts/sparc/Makefile.targ.shared
-echo_file usr/closed/uts/sparc/Makefile.targ
 echo_file usr/src/uts/common/Makefile.files
-echo_file usr/closed/uts/common/Makefile.files
 echo_file usr/src/uts/common/Makefile.rules
-echo_file usr/closed/uts/common/Makefile.rules
diff --git a/usr/src/uts/sparc/nfs/inc.flg b/usr/src/uts/sparc/nfs/inc.flg
index 483eb6098e..77d0388702 100644
--- a/usr/src/uts/sparc/nfs/inc.flg
+++ b/usr/src/uts/sparc/nfs/inc.flg
@@ -37,14 +37,11 @@ find_files "s.*.h" \
 	usr/src/uts/common/fs \
 	usr/src/uts/common/netinet \
 	usr/src/uts/common/nfs \
-	usr/closed/uts/common/nfs \
 	usr/src/uts/common/rpc \
 	usr/src/uts/common/sys \
-	usr/closed/uts/common/sys \
 	usr/src/uts/common/vm \
 	usr/src/uts/sparc/sys \
-	usr/src/uts/sun/sys \
-	usr/closed/uts/sun/sys
+	usr/src/uts/sun/sys
 
 # Find RPC .x files and Makefile so that "make all_h" works.
 
diff --git a/usr/src/uts/sparc/nfssrv/inc.flg b/usr/src/uts/sparc/nfssrv/inc.flg
index 4f998cac6e..7b692e8316 100644
--- a/usr/src/uts/sparc/nfssrv/inc.flg
+++ b/usr/src/uts/sparc/nfssrv/inc.flg
@@ -38,14 +38,11 @@ find_files "s.*.h" \
 	usr/src/uts/common/fs \
 	usr/src/uts/common/netinet \
 	usr/src/uts/common/nfs \
-	usr/closed/uts/common/nfs \
 	usr/src/uts/common/rpc \
 	usr/src/uts/common/sys \
-	usr/closed/uts/common/sys \
 	usr/src/uts/common/vm \
 	usr/src/uts/sparc/sys \
-	usr/src/uts/sun/sys \
-	usr/closed/uts/sun/sys
+	usr/src/uts/sun/sys
 
 # Find RPC .x files and Makefile so that "make all_h" works.
 
diff --git a/usr/src/uts/sparc/req.flg b/usr/src/uts/sparc/req.flg
index b72e4a1fb5..35836f2430 100644
--- a/usr/src/uts/sparc/req.flg
+++ b/usr/src/uts/sparc/req.flg
@@ -32,20 +32,14 @@ echo_file usr/src/uts/sparc/Makefile.files
 echo_file usr/src/uts/sparc/Makefile.rules
 echo_file usr/src/uts/sparc/Makefile.sparc
 echo_file usr/src/uts/sparc/Makefile.sparc.shared
-echo_file usr/closed/uts/sparc/Makefile.sparc
 echo_file usr/src/uts/sparc/Makefile.targ
 echo_file usr/src/uts/sparc/Makefile.targ.shared
-echo_file usr/closed/uts/sparc/Makefile.targ
 
 echo_file usr/src/uts/sun/Makefile.files
-echo_file usr/closed/uts/sun/Makefile.files
 echo_file usr/src/uts/sun/Makefile.rules
-echo_file usr/closed/uts/sun/Makefile.rules
 
 echo_file usr/src/uts/common/Makefile.files
-echo_file usr/closed/uts/common/Makefile.files
 echo_file usr/src/uts/common/Makefile.rules
-echo_file usr/closed/uts/common/Makefile.rules
 
 # uts/Makefile.targ (version 1.17) says "All C objects depend on
 # inline files".  
diff --git a/usr/src/uts/sun/io/scsi/inc.flg b/usr/src/uts/sun/io/scsi/inc.flg
index a416b2c271..37731b989e 100644
--- a/usr/src/uts/sun/io/scsi/inc.flg
+++ b/usr/src/uts/sun/io/scsi/inc.flg
@@ -34,31 +34,19 @@
 find_files "s.*"	\
 	usr/src/uts/common/io/warlock \
 	usr/src/uts/common/io/scsi \
-	usr/closed/uts/common/io/scsi \
 	usr/src/uts/common/sys \
-	usr/closed/uts/common/sys \
-	usr/closed/uts/sparc/dad	\
 	usr/src/uts/sparc/dada	\
 	usr/src/uts/sparc/esp	\
 	usr/src/uts/sparc/fas	\
-	usr/closed/uts/sparc/glm	\
-	usr/closed/uts/sparc/ifp	\
-	usr/closed/uts/sparc/isp	\
 	usr/src/uts/sparc/scsi	\
 	usr/src/uts/sparc/sd	\
 	usr/src/uts/sparc/ses	\
-	usr/closed/uts/sparc/sgen	\
-	usr/closed/uts/sparc/socal	\
 	usr/src/uts/sparc/ssd	\
 	usr/src/uts/sparc/st	\
-	usr/closed/uts/sparc/uata	\
 	usr/src/uts/sparc/warlock \
 	usr/src/uts/sun/io/dada \
-	usr/closed/uts/sun/io/dada \
 	usr/src/uts/sun/sys/dada \
-	usr/closed/uts/sun/sys/dada \
-	usr/src/uts/sun/sys/scsi \
-	usr/closed/uts/sun/sys/scsi
+	usr/src/uts/sun/sys/scsi
 
 find_files "s.*.h"	\
 	usr/src/uts/sparc/sys \
@@ -78,9 +66,7 @@ echo_file  usr/src/uts/Makefile
 echo_file  usr/src/uts/Makefile.targ
 echo_file  usr/src/uts/Makefile.uts
 echo_file  usr/src/uts/common/Makefile.files
-echo_file  usr/closed/uts/common/Makefile.files
 echo_file  usr/src/uts/common/Makefile.rules
-echo_file  usr/closed/uts/common/Makefile.rules
 echo_file  usr/src/uts/common/vm/as.h
 echo_file  usr/src/uts/common/vm/faultcode.h
 echo_file  usr/src/uts/common/vm/hat.h
@@ -93,23 +79,14 @@ echo_file  usr/src/uts/sparc/Makefile.files
 echo_file  usr/src/uts/sparc/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.sparc.shared
-echo_file  usr/closed/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/Makefile.targ.shared
-echo_file  usr/closed/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/ml/sparc.il
 echo_file  usr/src/uts/sparc/req.flg
 echo_file  usr/src/uts/sun/Makefile.files
-echo_file  usr/closed/uts/sun/Makefile.files
 echo_file  usr/src/uts/sun/Makefile.rules
-echo_file  usr/closed/uts/sun/Makefile.rules
-echo_file  usr/closed/uts/sun/io/socal.c
-echo_file  usr/closed/uts/sun/io/socal_ucode.c
 echo_file  usr/src/uts/sun/sys/dmaga.h
 echo_file  usr/src/uts/sun/sys/obpdefs.h
 echo_file  usr/src/uts/sun/sys/promif.h
-echo_file  usr/closed/uts/sun/sys/socal_cq_defs.h
-echo_file  usr/closed/uts/sun/sys/socalmap.h
 echo_file  usr/src/uts/sun/sys/socalreg.h
-echo_file  usr/closed/uts/sun/sys/socalvar.h
 echo_file  usr/src/uts/sun/sys/socalio.h
diff --git a/usr/src/uts/sun4u/kmech_krb5/inc.flg b/usr/src/uts/sun4u/kmech_krb5/inc.flg
index 90010a2199..b79896d59c 100644
--- a/usr/src/uts/sun4u/kmech_krb5/inc.flg
+++ b/usr/src/uts/sun4u/kmech_krb5/inc.flg
@@ -27,14 +27,12 @@
 # Use is subject to license terms.
 #
 find_files "s.*.h" usr/src/uts/common/sys
-find_files "s.*.h" usr/closed/uts/common/sys
 find_files "s.*.h" usr/src/uts/common/rpc
 find_files "s.*.h" usr/src/uts/common/gssapi
 find_files "s.*.h" usr/src/uts/common/vm
 find_files "s.*.h" usr/src/uts/common/netinet
 find_files "s.*.h" usr/src/uts/common/net
 find_files "s.*.h" usr/src/uts/sun4u/sys
-find_files "s.*.h" usr/closed/uts/sun4u/sys
 find_files "s.*.h" usr/src/uts/sparc/sys
 find_files "s.*.h" usr/src/uts/sparc/v7
 find_files "s.*.h" usr/src/uts/sparc/v9
@@ -44,4 +42,3 @@ find_files "s.*" usr/src/uts/sparc/ml
 find_files "s.*" usr/src/uts/sfmmu
 find_files "s.*" usr/src/uts/common/gssapi/mechs/krb5
 find_files "s.*" usr/src/lib/gss_mechs/mech_krb5
-find_files "s.*" usr/closed/lib/gss_mechs/mech_krb5
diff --git a/usr/src/uts/sun4u/kmech_krb5/req.flg b/usr/src/uts/sun4u/kmech_krb5/req.flg
index 27d90534b8..f8e8b042e3 100644
--- a/usr/src/uts/sun4u/kmech_krb5/req.flg
+++ b/usr/src/uts/sun4u/kmech_krb5/req.flg
@@ -28,25 +28,17 @@
 #
 echo_file usr/src/uts/sun4u/Makefile
 echo_file usr/src/uts/sun4u/Makefile.files
-echo_file usr/closed/uts/sun4u/Makefile.files
 echo_file usr/src/uts/sun4u/Makefile.sun4u
 echo_file usr/src/uts/sun4u/Makefile.sun4u.shared
-echo_file usr/closed/uts/sun4u/Makefile.sun4u
 echo_file usr/src/uts/sun4u/Makefile.rules
-echo_file usr/closed/uts/sun4u/Makefile.rules
 echo_file usr/src/uts/sun4u/Makefile.targ
 echo_file usr/src/uts/sun4u/Makefile.targ.shared
-echo_file usr/closed/uts/sun4u/Makefile.targ
 echo_file usr/src/uts/sun4u/Makefile.workarounds
 echo_file usr/src/uts/sparc/Makefile.rules
 echo_file usr/src/uts/sparc/Makefile.files
 echo_file usr/src/uts/sun/Makefile.files
-echo_file usr/closed/uts/sun/Makefile.files
 echo_file usr/src/uts/sun/Makefile.rules
-echo_file usr/closed/uts/sun/Makefile.rules
 echo_file usr/src/uts/sparc/v9/Makefile.files
 echo_file usr/src/uts/sparc/v9/Makefile.rules
 echo_file usr/src/uts/common/Makefile.files
-echo_file usr/closed/uts/common/Makefile.files
 echo_file usr/src/uts/common/Makefile.rules
-echo_file usr/closed/uts/common/Makefile.rules