diff options
Diffstat (limited to 'usr/src/tools')
| -rw-r--r-- | usr/src/tools/findunref/exception_list.open | 14 | ||||
| -rw-r--r-- | usr/src/tools/scripts/checkpaths.sh | 11 | ||||
| -rw-r--r-- | usr/src/tools/scripts/nightly.1 | 14 | ||||
| -rw-r--r-- | usr/src/tools/scripts/nightly.sh | 70 | ||||
| -rw-r--r-- | usr/src/tools/scripts/stdenv.sh | 16 |
5 files changed, 0 insertions, 125 deletions
diff --git a/usr/src/tools/findunref/exception_list.open b/usr/src/tools/findunref/exception_list.open index afc9b44a2f..6e298428e7 100644 --- a/usr/src/tools/findunref/exception_list.open +++ b/usr/src/tools/findunref/exception_list.open @@ -158,24 +158,10 @@ # # Ignore files that get used during a EXPORT_SRC or CRYPT_SRC build only. # -./usr/src/common/crypto/aes/Makefile -./usr/src/common/crypto/arcfour/Makefile -./usr/src/common/crypto/blowfish/Makefile -./usr/src/common/crypto/des/Makefile -./usr/src/common/crypto/rsa/Makefile ./usr/src/lib/gss_mechs/mech_dh/backend/mapfile-vers ./usr/src/lib/gss_mechs/mech_dh/dh1024/mapfile-vers ./usr/src/lib/gss_mechs/mech_dh/dh192/mapfile-vers ./usr/src/lib/gss_mechs/mech_dh/dh640/mapfile-vers -./usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean -./usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean -./usr/src/lib/pkcs11/pkcs11_softtoken/common/Makefile -./usr/src/uts/common/Makefile -./usr/src/uts/common/crypto/io/Makefile -./usr/src/uts/common/gssapi/include/Makefile -./usr/src/uts/common/gssapi/mechs/dummy/Makefile -./usr/src/uts/common/gssapi/mechs/krb5/Makefile -./usr/src/xmod # # Ignore Makefiles which are used by developers but not used by nightly diff --git a/usr/src/tools/scripts/checkpaths.sh b/usr/src/tools/scripts/checkpaths.sh index 7582e728dd..836ed71653 100644 --- a/usr/src/tools/scripts/checkpaths.sh +++ b/usr/src/tools/scripts/checkpaths.sh @@ -116,17 +116,6 @@ if [ -r $SRC/tools/findunref/exception_list ]; then validate_paths -k ISUSED -r -e '^\*' $SRC/tools/findunref/exception_list fi -# These are straightforward. -if [ -d $SRC/xmod ]; then - # If the closed source is not present, then don't validate it. - if [ "$CLOSED_IS_PRESENT" = no ]; then - excl_cry="-e ^usr/closed" - excl_xmod="-e ^../closed" - fi - validate_paths $excl_cry $SRC/xmod/cry_files - validate_paths $excl_xmod -b $SRC $SRC/xmod/xmod_files -fi - if [ -f $SRC/tools/opensolaris/license-list ]; then excl= if [ "$CLOSED_IS_PRESENT" = no ]; then diff --git a/usr/src/tools/scripts/nightly.1 b/usr/src/tools/scripts/nightly.1 index cbcd39d3ad..01c4d287ac 100644 --- a/usr/src/tools/scripts/nightly.1 +++ b/usr/src/tools/scripts/nightly.1 @@ -532,20 +532,6 @@ corresponding variable for Mercurial or Subversion, which are assumed to be installed in the default path. .RE .LP -.B EXPORT_SRC -.RS 5 -The source product has no SCCS history, and is modified to remove source -that cannot be shipped. EXPORT_SRC is where the clear files are copied, then -modified with 'make EXPORT_SRC'. -.RE -.LP -.B CRYPT_SRC -.RS 5 -CRYPT_SRC is similar to EXPORT_SRC, but after 'make CRYPT_SRC' the files in -xmod/cry_files are saved. They are dropped on the exportable source to create -the domestic build. -.LP -.RE .B OPEN_SRCDIR .RS 5 The open source tree is copied to this directory when simulating an diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index 9ad9454f4d..957eeb8e02 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -163,25 +163,6 @@ function filelist { DEST=$1 PATTERN=$2 cd ${DEST} - - OBJFILES=${ORIG_SRC}/xmod/obj_files - if [ ! -f ${OBJFILES} ]; then - return; - fi - for i in `grep -v '^#' ${OBJFILES} | \ - grep ${PATTERN} | cut -d: -f2 | tr -d ' \t'` - do - # wildcard expansion - for j in $i - do - if [ -f "$j" ]; then - echo $j - fi - if [ -d "$j" ]; then - echo $j - fi - done - done | sort | uniq } # function to save off binaries after a full build for later @@ -415,55 +396,6 @@ function set_up_source_build { echo "clearing state files." >> $LOGFILE find . -name '.make*' -exec rm -f {} \; - - cd ${DEST} - if [ "${MAKETARG}" = "CRYPT_SRC" ]; then - rm -f ${CODEMGR_WS}/crypt_files.cpio.Z - echo "\n==== xmod/cry_files that don't exist ====\n" | \ - tee -a $mail_msg_file >> $LOGFILE - CRYPT_FILES=${WS}/usr/src/xmod/cry_files - for i in `cat ${CRYPT_FILES}` - do - # make sure the files exist - if [ -f "$i" ]; then - continue - fi - if [ -d "$i" ]; then - continue - fi - echo "$i" | tee -a $mail_msg_file >> $LOGFILE - done - find `cat ${CRYPT_FILES}` -print 2>/dev/null | \ - cpio -ocB 2>/dev/null | \ - compress > ${CODEMGR_WS}/crypt_files.cpio.Z - fi - - if [ "${MAKETARG}" = "EXPORT_SRC" ]; then - # rename first, since we might restore a file - # of the same name (mapfiles) - rename_files ${EXPORT_SRC} EXPORT_SRC - if [ "$SH_FLAG" = "y" ]; then - hybridize_files ${EXPORT_SRC} EXPORT_SRC - fi - fi - - # save the cleartext - echo "\n==== Creating ${MAKETARG}.cpio.Z ====\n" | \ - tee -a $mail_msg_file >> $LOGFILE - cd ${DEST} - rm -f ${MAKETARG}.cpio.Z - find usr -depth -print | \ - grep -v usr/src/${MAKETARG}.out | \ - cpio -ocB 2>/dev/null | \ - compress > ${CODEMGR_WS}/${MAKETARG}.cpio.Z - if [ "${MAKETARG}" = "EXPORT_SRC" ]; then - restore_binaries ${EXPORT_SRC} EXPORT_SRC - fi - - if [ "${MAKETARG}" = "CRYPT_SRC" ]; then - restore_binaries ${CRYPT_SRC} CRYPT_SRC - fi - } # Return library search directive as function of given root. @@ -1098,8 +1030,6 @@ NIGHTLY_OPTIONS variable in the <env_file> as follows: O - build (only) open source ' # -# -x less public handling of xmod source for the source product -# # A log file will be generated under the name $LOGFILE # for partially completed build and log.`date '+%F'` # in the same directory for fully completed builds. diff --git a/usr/src/tools/scripts/stdenv.sh b/usr/src/tools/scripts/stdenv.sh index 8eb05ab834..50f4c4a5cc 100644 --- a/usr/src/tools/scripts/stdenv.sh +++ b/usr/src/tools/scripts/stdenv.sh @@ -23,8 +23,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # Shell script fragment to set standard build environment variables, @@ -34,20 +32,6 @@ # # -# the source product has no SCCS history, and is modified to remove source -# that cannot be shipped. EXPORT_SRC is where the clear files are copied, then -# modified with 'make EXPORT_SRC'. -# -[ -n "$EXPORT_SRC" ] || export EXPORT_SRC="$CODEMGR_WS/export_src" - -# -# CRYPT_SRC is similar to EXPORT_SRC, but after 'make CRYPT_SRC' the files in -# xmod/cry_files are saved. They are dropped on the exportable source to create -# the domestic build. -# -[ -n "$CRYPT_SRC" ] || export CRYPT_SRC="$CODEMGR_WS/crypt_src" - -# # OPEN_SRCDIR is where we copy the open tree to so that we can be sure # we don't have a hidden dependency on closed code. The name ends in # "DIR" to avoid confusion with the flags related to open source |