Print this page
4028 remove CLOSED_IS_PRESENT

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/scripts/checkpaths.sh
          +++ new/usr/src/tools/scripts/checkpaths.sh
↓ open down ↓ 51 lines elided ↑ open up ↑
  52   52  # areas), build workspaces (which should contain just one proto area),
  53   53  # and unbuilt workspaces (which contain no proto areas).
  54   54  if [ "$b_flg" = y ]; then
  55   55          rootlist=
  56   56  elif [ $# -gt 0 ]; then
  57   57          rootlist=$*
  58   58  else
  59   59          rootlist="$CODEMGR_WS/proto/root_sparc $CODEMGR_WS/proto/root_i386"
  60   60  fi
  61   61  
  62      -# If the closed source is not present, then exclude IKE from validation.
  63      -if [ "$CLOSED_IS_PRESENT" = no ]; then
  64      -        excl="-e ^usr/include/ike/"
  65      -fi
  66      -
  67   62  for ROOT in $rootlist
  68   63  do
  69   64          case "$ROOT" in
  70   65          *sparc|*sparc-nd)
  71   66                  arch=sparc
  72   67                  ;;
  73   68          *i386|*i386-nd)
  74   69                  arch=i386
  75   70                  ;;
  76   71          *)
  77   72                  echo "$ROOT has unknown architecture." >&2
  78   73                  exit 1
  79   74                  ;;
  80   75          esac
  81   76          if [ -d $ROOT ]; then
  82   77                  #
  83   78                  # This is the old-style packaging exception list, from
  84   79                  # the svr4-specific usr/src/pkgdefs
  85   80                  #
  86   81                  [ -f $SRC/pkgdefs/etc/exception_list_$arch ] && \
  87      -                        validate_paths '-s/\s*'$arch'$//' $excl -b $ROOT \
       82 +                        validate_paths '-s/\s*'$arch'$//'  \
       83 +                            -e ^usr/include/ike/ -b $ROOT \
  88   84                              $args $SRC/pkgdefs/etc/exception_list_$arch
  89   85                  #
  90   86                  # These are the new-style packaging exception lists,
  91   87                  # from the repository-wide exception_lists/ directory.
  92   88                  #
  93   89                  e="$CODEMGR_WS/exception_lists/packaging"
  94   90                  for f in $e; do
  95   91                          if [ -f $f ]; then
  96   92                                  nawk 'NF == 1 || /[     ]\+'$arch'$/ { print; }' \
  97   93                                      < $f | validate_paths -b $ROOT -n $f
↓ open down ↓ 12 lines elided ↑ open up ↑
 110  106  # at the top of the file.
 111  107  #
 112  108  # The exception_list is generated from whichever input files are appropriate
 113  109  # for this workspace, so checking it obviates the need to check the inputs.
 114  110  
 115  111  if [ -r $SRC/tools/findunref/exception_list ]; then
 116  112          validate_paths -k ISUSED -r -e '^\*' $SRC/tools/findunref/exception_list
 117  113  fi
 118  114  
 119  115  if [ -f $SRC/tools/opensolaris/license-list ]; then
 120      -        excl=
 121      -        if [ "$CLOSED_IS_PRESENT" = no ]; then
 122      -                excl="-e ^usr/closed"
 123      -        fi
 124  116          sed -e 's/$/.descrip/' < $SRC/tools/opensolaris/license-list | \
 125      -                validate_paths -n SRC/tools/opensolaris/license-list $excl
      117 +                validate_paths -n SRC/tools/opensolaris/license-list \
      118 +                    -e ^usr/closed
 126  119  fi
 127  120  
 128  121  # Finally, make sure the that (req|inc).flg files are in good shape.
 129  122  # If SCCS files are not expected to be present, though, then don't
 130  123  # check them.
 131  124  if [ ! -d "$CODEMGR_WS/Codemgr_wsdata" ]; then
 132  125          f_flg='-f'
 133  126  fi
 134      -# If the closed source is not present, then don't validate it.
 135      -if [ "$CLOSED_IS_PRESENT" = no ]; then
 136      -        excl="-e ^usr/closed/"
 137      -fi
 138  127  
 139      -validate_flg $f_flg $excl
      128 +validate_flg $f_flg -e ^usr/closed/
 140  129  
 141  130  exit 0
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX