4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>

@@ -57,15 +57,10 @@
         rootlist=$*
 else
         rootlist="$CODEMGR_WS/proto/root_sparc $CODEMGR_WS/proto/root_i386"
 fi
 
-# If the closed source is not present, then exclude IKE from validation.
-if [ "$CLOSED_IS_PRESENT" = no ]; then
-        excl="-e ^usr/include/ike/"
-fi
-
 for ROOT in $rootlist
 do
         case "$ROOT" in
         *sparc|*sparc-nd)
                 arch=sparc

@@ -82,11 +77,12 @@
                 #
                 # This is the old-style packaging exception list, from
                 # the svr4-specific usr/src/pkgdefs
                 #
                 [ -f $SRC/pkgdefs/etc/exception_list_$arch ] && \
-                        validate_paths '-s/\s*'$arch'$//' $excl -b $ROOT \
+                        validate_paths '-s/\s*'$arch'$//'  \
+                            -e ^usr/include/ike/ -b $ROOT \
                             $args $SRC/pkgdefs/etc/exception_list_$arch
                 #
                 # These are the new-style packaging exception lists,
                 # from the repository-wide exception_lists/ directory.
                 #

@@ -115,27 +111,20 @@
 if [ -r $SRC/tools/findunref/exception_list ]; then
         validate_paths -k ISUSED -r -e '^\*' $SRC/tools/findunref/exception_list
 fi
 
 if [ -f $SRC/tools/opensolaris/license-list ]; then
-        excl=
-        if [ "$CLOSED_IS_PRESENT" = no ]; then
-                excl="-e ^usr/closed"
-        fi
         sed -e 's/$/.descrip/' < $SRC/tools/opensolaris/license-list | \
-                validate_paths -n SRC/tools/opensolaris/license-list $excl
+                validate_paths -n SRC/tools/opensolaris/license-list \
+                    -e ^usr/closed
 fi
 
 # Finally, make sure the that (req|inc).flg files are in good shape.
 # If SCCS files are not expected to be present, though, then don't
 # check them.
 if [ ! -d "$CODEMGR_WS/Codemgr_wsdata" ]; then
         f_flg='-f'
 fi
-# If the closed source is not present, then don't validate it.
-if [ "$CLOSED_IS_PRESENT" = no ]; then
-        excl="-e ^usr/closed/"
-fi
 
-validate_flg $f_flg $excl
+validate_flg $f_flg -e ^usr/closed/
 
 exit 0