4525 remove last vestiges of tonic

Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Jens Elkner <jel+illumos@cs.uni-magdeburg.de>
Approved by: Gordon Ross <gwr@nexenta.com>

9 files changed, 2 insertions, 983 deletions

diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index bf01650e0f..5c11b9c53b 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -81,7 +81,6 @@ $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/stabs mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/tokenize mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/tokenize.exe mode=0555
 file path=opt/onbld/bin/Install mode=0555
-file path=opt/onbld/bin/bindrop mode=0555
 file path=opt/onbld/bin/bldenv mode=0555
 file path=opt/onbld/bin/bringovercheck mode=0555
 file path=opt/onbld/bin/build_cscope mode=0555
@@ -90,7 +89,6 @@ file path=opt/onbld/bin/check_rtime mode=0555
 file path=opt/onbld/bin/checkpaths mode=0555
 file path=opt/onbld/bin/checkproto mode=0555
 file path=opt/onbld/bin/copyrightchk mode=0555
-file path=opt/onbld/bin/cryptodrop mode=0555
 file path=opt/onbld/bin/cstyle mode=0555
 file path=opt/onbld/bin/ctfcvtptbl mode=0555
 file path=opt/onbld/bin/ctffindmod mode=0555
@@ -110,8 +108,6 @@ file path=opt/onbld/bin/interface_cmp mode=0555
 file path=opt/onbld/bin/jstyle mode=0555
 file path=opt/onbld/bin/make_pkg_db mode=0555
 file path=opt/onbld/bin/mapfilechk mode=0555
-file path=opt/onbld/bin/mkreadme_osol mode=0555
-file path=opt/onbld/bin/mktpl mode=0555
 file path=opt/onbld/bin/nightly mode=0555
 file path=opt/onbld/bin/onu mode=0555
 file path=opt/onbld/bin/protocmp.terse mode=0555
diff --git a/usr/src/req.flg b/usr/src/req.flg
index f0ba2c5e02..83e2936a36 100644
--- a/usr/src/req.flg
+++ b/usr/src/req.flg
@@ -32,7 +32,3 @@ echo_file usr/src/Makefile.master.64
 echo_file usr/src/Makefile.msg.targ
 echo_file usr/src/Makefile.psm
 echo_file usr/src/Makefile.psm.targ
-echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetCF
-echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetSE
-echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetCF
-echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetSE
diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile
index 19e58d0244..22c62d1e7f 100644
--- a/usr/src/tools/scripts/Makefile
+++ b/usr/src/tools/scripts/Makefile
@@ -27,13 +27,11 @@ SHELL=/usr/bin/ksh93
 
 SHFILES= \
 	Install \
-	bindrop \
 	bldenv \
 	build_cscope \
 	bringovercheck \
 	checkpaths \
 	checkproto \
-	cryptodrop \
 	cstyle \
 	elfcmp \
 	flg.flp \
@@ -54,8 +52,6 @@ PERLFILES= \
 	interface_check \
 	interface_cmp \
 	jstyle \
-	mkreadme_osol \
-	mktpl \
 	validate_flg \
 	validate_paths \
 	wdiff
diff --git a/usr/src/tools/scripts/bindrop.sh b/usr/src/tools/scripts/bindrop.sh
deleted file mode 100644
index 58bd05edc5..0000000000
--- a/usr/src/tools/scripts/bindrop.sh
+++ /dev/null
@@ -1,278 +0,0 @@
-#! /usr/bin/ksh -p
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Create an encumbered binaries tarball from a full build proto area,
-# less the contents of an OpenSolaris proto area.  Special handling
-# for crypto binaries that need to be signed by Sun Release
-# Engineering.
-#
-
-usage="bindrop [-n] basename"
-
-isa=`uname -p`
-
-PATH="$PATH:/usr/bin:/usr/sfw/bin"
-
-function fail {
-	print -u2 "bindrop: $@"
-	exit 1
-}
-
-function warn {
-	print -u2 "bindrop: warning: $@"
-}
-
-[[ -n "$SRC" ]] || fail "SRC must be set."
-[[ -n "$CODEMGR_WS" ]] || fail "CODEMGR_WS must be set."
-
-#
-# Create the README from boilerplate and the contents of the closed
-# binary tree.
-#
-# usage: mkreadme targetdir
-#
-function mkreadme {
-	typeset targetdir="$1"
-	typeset readme="README.ON-BINARIES.$isa"
-
-	sed -e s/@ISA@/$isa/ -e s/@DELIVERY@/ON-BINARIES/ \
-	    "$SRC/tools/opensolaris/README.binaries.tmpl" > "$targetdir/$readme"
-	(cd "$targetdir"; find "$rootdir" -type f -print | \
-	    sort >> "$targetdir/$readme")
-}
-
-nondebug=n
-while getopts n flag; do
-	case $flag in
-	n)
-		nondebug=y
-		;;
-	?)
-		print -u2 "usage: $usage"
-		exit 1
-		;;
-	esac
-done
-shift $(($OPTIND - 1))
-
-if [[ $# -ne 1 ]]; then
-	print -u2 "usage: $usage"
-	exit 1
-fi
-
-tarfile="$CODEMGR_WS/$1.$isa.tar"
-
-rootdir="root_$isa"
-suffix=""
-if [[ "$nondebug" = y ]]; then
-	rootdir="root_$isa-nd"
-	suffix="-nd"
-fi
-
-[[ -d "${ROOT}${suffix}-closed" ]] || fail "can't find closed root proto area."
-
-tmpdir=$(mktemp -dt bindropXXXXX)
-[[ -n "$tmpdir" ]] || fail "can't create temporary directory."
-mkdir -p "$tmpdir/closed/$rootdir" || exit 1
-
-#
-# This will hold a temp list of directories that must be kept, even if
-# empty.
-#
-needdirs=$(mktemp -t needdirsXXXXX)
-[[ -n "$needdirs" ]] || fail "can't create temporary directory list file."
-
-#
-# Copy the closed root parallel tree into a temp directory.
-#
-(cd "${ROOT}${suffix}-closed"; tar cf - .) | (cd "$tmpdir/closed/$rootdir"; tar xpf -)
-
-#
-# Remove internal ON crypto signing certs
-#
-delete="
-	etc/certs/SUNWosnetSE
-	etc/certs/SUNWosnetSolaris
-	etc/crypto/certs/SUNWosnet
-	etc/crypto/certs/SUNWosnetLimited
-	etc/crypto/certs/SUNWosnetCF
-	etc/crypto/certs/SUNWosnetCFLimited
-	"
-
-#
-# Remove miscellaneous files that we don't want to ship.
-#
-
-# SUNWsvvs (SVVS test drivers).
-delete="$delete
-	usr/include/sys/svvslo.h
-	usr/include/sys/tidg.h
-	usr/include/sys/tivc.h
-	usr/include/sys/tmux.h
-	usr/kernel/drv/amd64/svvslo
-	usr/kernel/drv/amd64/tidg
-	usr/kernel/drv/amd64/tivc
-	usr/kernel/drv/amd64/tmux
-	usr/kernel/drv/sparcv9/svvslo
-	usr/kernel/drv/sparcv9/tidg
-	usr/kernel/drv/sparcv9/tivc
-	usr/kernel/drv/sparcv9/tmux
-	usr/kernel/drv/svvslo
-	usr/kernel/drv/svvslo.conf
-	usr/kernel/drv/tidg
-	usr/kernel/drv/tidg.conf
-	usr/kernel/drv/tivc
-	usr/kernel/drv/tivc.conf
-	usr/kernel/drv/tmux
-	usr/kernel/drv/tmux.conf
-	usr/kernel/strmod/amd64/lmodb
-	usr/kernel/strmod/amd64/lmode
-	usr/kernel/strmod/amd64/lmodr
-	usr/kernel/strmod/amd64/lmodt
-	usr/kernel/strmod/lmodb
-	usr/kernel/strmod/lmode
-	usr/kernel/strmod/lmodr
-	usr/kernel/strmod/lmodt
-	usr/kernel/strmod/sparcv9/lmodb
-	usr/kernel/strmod/sparcv9/lmode
-	usr/kernel/strmod/sparcv9/lmodr
-	usr/kernel/strmod/sparcv9/lmodt
-"
-# encumbered binaries and associated files
-delete="$delete
-	kernel/drv/amd64/bmc
-	kernel/drv/bmc
-	kernel/drv/bmc.conf
-	kernel/drv/ifp.conf
-	kernel/drv/sparcv9/ifp
-	kernel/drv/sparcv9/isp
-	kernel/drv/sparcv9/qus
-	kernel/drv/spwr
-	kernel/kmdb/sparcv9/isp
-	usr/has/bin/ksh
-	usr/has/bin/pfksh
-	usr/has/bin/rksh
-	usr/include/sys/scsi/adapters/ifpcmd.h
-	usr/include/sys/scsi/adapters/ifpio.h
-	usr/include/sys/scsi/adapters/ifpmail.h
-	usr/include/sys/scsi/adapters/ifpreg.h
-	usr/include/sys/scsi/adapters/ifpvar.h
-	usr/include/sys/scsi/adapters/ispcmd.h
-	usr/include/sys/scsi/adapters/ispmail.h
-	usr/include/sys/scsi/adapters/ispreg.h
-	usr/include/sys/scsi/adapters/ispvar.h
-	usr/lib/mdb/kvm/sparcv9/isp.so
-	usr/platform/sun4u/include/sys/memtestio.h
-	usr/platform/sun4u/include/sys/memtestio_ch.h
-	usr/platform/sun4u/include/sys/memtestio_chp.h
-	usr/platform/sun4u/include/sys/memtestio_ja.h
-	usr/platform/sun4u/include/sys/memtestio_jg.h
-	usr/platform/sun4u/include/sys/memtestio_sf.h
-	usr/platform/sun4u/include/sys/memtestio_sr.h
-	usr/platform/sun4u/include/sys/memtestio_u.h
-	usr/platform/sun4u/include/sys/memtestio_pn.h
-	usr/platform/sun4v/include/sys/memtestio.h
-	usr/platform/sun4v/include/sys/memtestio_ni.h
-	usr/platform/sun4v/include/sys/memtestio_v.h
-"
-# memory fault injector test framework
-delete="$delete
-	usr/bin/mtst
-	platform/sun4u/kernel/drv/sparcv9/memtest
-	platform/sun4u/kernel/drv/memtest.conf
-	platform/sun4v/kernel/drv/sparcv9/memtest
-	platform/sun4v/kernel/drv/memtest.conf
-	kernel/drv/memtest.conf
-	kernel/drv/memtest
-	kernel/drv/amd64/memtest
-	usr/platform/i86pc/lib/mtst/mtst_AuthenticAMD_15.so
-	usr/platform/i86pc/lib/mtst/mtst_AuthenticAMD.so
-	usr/platform/i86pc/lib/mtst/mtst_generic.so
-	usr/platform/i86pc/lib/mtst/mtst_GenuineIntel.so
-"
-for f in $delete; do
-	rm -rf "$tmpdir/closed/$rootdir/$f"
-done
-
-#
-# Remove any header files.  If they're in the closed tree, they're
-# probably not freely redistributable.
-#
-(cd "$tmpdir/closed/$rootdir"; find . -name \*.h \
-	-a \! -name lc_core.h \
-	-a \! -name localedef.h \
-	-exec rm -f {} \;)
-
-#
-# Remove empty directories that the open tree doesn't need.
-#
-# Step 1: walk the redistributable manifests to find out which directories
-# are specified in the open packages; save that list to a temporary
-# file $needdirs.
-#
-MACH=$(uname -p)
-(cd "$SRC/pkg/packages.$MACH"; \
-	nawk '/^dir/ {sub(/.+ path=/, ""); print $1;}' *.metadata.*.redist | \
-	sort -u > "$needdirs")
-
-#
-# Step 2: go to our closed directory, and find all the subdirectories,
-# filtering out the ones needed by the open packages (saved in that
-# temporary file).  Sort in reverse order, so that parent directories
-# come after any subdirectories, and pipe that to rmdir.  If there are
-# still any lingering files, rmdir will complain.  That's fine--we
-# only want to delete empty directories--so redirect the complaints to
-# /dev/null.
-#
-(cd "$tmpdir/closed/$rootdir"; \
-	find * -type d -print | /usr/xpg4/bin/grep -xv -f $needdirs | \
-	sort -r | xargs -l rmdir 2>/dev/null )
-
-rm "$needdirs"
-
-#
-# Exclude signed crypto binaries; they are delivered in their
-# own tarball.
-#
-ROOT="$tmpdir/closed/$rootdir" findcrypto "$SRC/tools/codesign/creds" |
-    awk '{ print $2 }' | (cd "$tmpdir/closed/$rootdir"; xargs rm -f)
-
-#
-# Add binary license files.
-#
-
-cp -p "$SRC/tools/opensolaris/BINARYLICENSE.txt" "$tmpdir/closed" || \
-    fail "can't add BINARYLICENSE.txt"
-mkreadme "$tmpdir/closed"
-if [ -f "$CODEMGR_WS/THIRDPARTYLICENSE.ON-BINARIES" ]; then
-    cp -p "$CODEMGR_WS/THIRDPARTYLICENSE.ON-BINARIES" "$tmpdir/closed"
-fi
-
-(cd "$tmpdir"; tar cf "$tarfile" closed) || fail "can't create $tarfile."
-bzip2 -f "$tarfile" || fail "can't compress $tarfile".
-
-rm -rf "$tmpdir"
-
-exit 0
diff --git a/usr/src/tools/scripts/checkpaths.sh b/usr/src/tools/scripts/checkpaths.sh
index cf74c7362c..5a897deb45 100644
--- a/usr/src/tools/scripts/checkpaths.sh
+++ b/usr/src/tools/scripts/checkpaths.sh
@@ -114,17 +114,9 @@ fi
 
 if [ -f $SRC/tools/opensolaris/license-list ]; then
 	sed -e 's/$/.descrip/' < $SRC/tools/opensolaris/license-list | \
-		validate_paths -n SRC/tools/opensolaris/license-list \
-		    -e ^usr/closed
+		validate_paths -n SRC/tools/opensolaris/license-list
 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
-
-validate_flg $f_flg -e ^usr/closed/
+validate_flg -f
 
 exit 0
diff --git a/usr/src/tools/scripts/cryptodrop.sh b/usr/src/tools/scripts/cryptodrop.sh
deleted file mode 100644
index 2987b485ca..0000000000
--- a/usr/src/tools/scripts/cryptodrop.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/ksh -p
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# Create a tarball with crypto binaries.
-#
-
-usage="cryptodrop [-n] result-path"
-
-isa=`uname -p`
-
-function fail {
-	print -u2 "cryptodrop: $@"
-	exit 1
-}
-
-[[ -n "$ROOT" ]] || fail "ROOT must be set."
-# Verify below (after adjusting for -n) that $ROOT exists, is a directory.
-[[ -n "$SRC" ]] || fail "SRC must be set."
-[[ -d "$SRC" ]] || fail "SRC ($SRC) is not a directory."
-[[ -n "$CODEMGR_WS" ]] || fail "CODEMGR_WS must be set."
-[[ -d "$CODEMGR_WS" ]] || fail "CODEMGR_WS ($CODEMGR_WS) is not a directory."
-
-#
-# Wrapper over cpio to filter out "NNN blocks" messages.
-#
-function cpio_filt {
-	integer cpio_stat
-
-	cpio "$@" > "$cpio_log" 2>&1
-	cpio_stat=$?
-	cat "$cpio_log" | awk '$0 !~ /[0-9]+ blocks/ { print }'
-	return $cpio_stat
-}
-
-#
-# Create the README from boilerplate and the contents of the closed
-# binary tree.
-#
-# usage: mkreadme targetdir
-#
-function mkreadme {
-	typeset targetdir="$1"
-	typeset readme="README.CRYPTO-BINARIES.$isa"
-
-	sed -e s/@ISA@/$isa/ -e s/@DELIVERY@/CRYPTO-BINARIES/ \
-	    "$SRC/tools/opensolaris/README.binaries.tmpl" > "$targetdir/$readme"
-	(cd "$targetdir"; find "$rootdir" -type f -print | \
-	    sort >> "$targetdir/$readme")
-}
-
-nondebug=n
-while getopts n flag; do
-	case $flag in
-	n)
-		nondebug=y
-		if [ "$MULTI_PROTO" = yes ]; then
-			export ROOT="$ROOT-nd"
-		fi
-		;;
-	?)
-		print -u2 "usage: $usage"
-		exit 1
-		;;
-	esac
-done
-shift $(($OPTIND - 1))
-
-if [[ $# -ne 1 ]]; then
-	print -u2 "usage: $usage"
-	exit 1
-fi
-[[ -d "$ROOT" ]] || fail "ROOT ($ROOT) is not a directory."
-
-tarfile="$1"
-
-if [[ "$nondebug" = n ]]; then
-	rootdir="root_$isa"
-else
-	rootdir="root_$isa-nd"
-fi
-
-tmpdir=$(mktemp -dt cryptodropXXXXX)
-[[ -n "$tmpdir" ]] || fail "could not create temporary directory."
-tmproot="$tmpdir/proto/$rootdir"
-mkdir -p "$tmproot" || exit 1
-cpio_log="$tmpdir/cpio.log"
-filelist="$tmpdir/files"
-
-#
-# Copy the crypto binaries into a temp directory.  This is a bit messy
-# because we want to preserve the permissions of intermediate
-# directories without including all the contents of those
-# directories.
-#
-
-# Echo all the parent directories of the given file.
-function alldirs {
-	d=$(dirname "$1")
-	while [ "$d" != . ]; do
-		echo $d
-		d=$(dirname "$d")
-	done
-}
-
-findcrypto "$SRC/tools/codesign/creds" | awk '{ print $2 }' > "$filelist"
-#
-# Both alldirs and the cpio -p invocation assume that findcrypto only
-# produces relative paths.
-#
-for f in $(cat "$filelist"); do
-	if [[ "$f" = /* ]]; then
-		fail "findcrypto produced absolute path ($f)"
-	fi
-done
-for f in $(cat "$filelist"); do
-	echo "$f"
-	alldirs "$f"
-done | sort -u | (cd "$ROOT"; cpio_filt -pdm "$tmproot")
-[[ $? -eq 0 ]] || fail "could not copy crypto files."
-
-rm -f "$cpio_log" "$filelist"
-
-#
-# Insert binary license files.
-#
-cp -p "$SRC/tools/opensolaris/BINARYLICENSE.txt" "$tmpdir/proto" || \
-    fail "could not add BINARYLICENSE.txt"
-mkreadme "$tmpdir/proto" || exit 1
-cp -p "$CODEMGR_WS/THIRDPARTYLICENSE.ON-CRYPTO" "$tmpdir/proto" || \
-    fail "could not add THIRDPARTYLICENSE.ON-CRYPTO."
-
-(cd "$tmpdir"; tar cf "$tarfile" proto) || fail "could not create $tarfile."
-bzip2 -f "$tarfile" || fail "could not compress $tarfile".
-
-rm -rf "$tmpdir"
-
-exit 0
diff --git a/usr/src/tools/scripts/mkreadme_osol.pl b/usr/src/tools/scripts/mkreadme_osol.pl
deleted file mode 100644
index b42545e309..0000000000
--- a/usr/src/tools/scripts/mkreadme_osol.pl
+++ /dev/null
@@ -1,135 +0,0 @@
-#! /usr/perl5/bin/perl
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# Generate README.opensolaris from a template for inclusion in a
-# delivery wad.
-# Usage: mkreadme_osol README.opensolaris < template
-#
-
-use strict;
-use warnings;
-
-#
-# Timeout and retry settings for wget.  Allow one retry for the
-# occasional glitch, but don't wait longer than 5 minutes (so as not
-# to hold up the build).
-#
-my $timeout = 150;
-my $tries = 2;
-
-#
-# Markers in the web pages that we download.
-#
-my $begin_data = qr/\[begin README tag - do not delete\]/;
-my $end_data = qr/\[end README tag - do not delete\]/;
-
-my $readme_fn = shift || die "missing README filepath\n";
-open(README_OUT, ">$readme_fn") || die "couldn't open $readme_fn\n";
-my @lines = <STDIN>;
-
-my %content;
-
-if (! $ENV{"HTTP_PROXY"}) {
-	if ($ENV{"http_proxy"}) {
-		$ENV{"HTTP_PROXY"} = $ENV{"http_proxy"};
-	} else {
-		$ENV{"HTTP_PROXY"} = "http://webcache.sfbay:8080";
-	}
-}
-if (! $ENV{"http_proxy"}) {
-	$ENV{"http_proxy"} = $ENV{"HTTP_PROXY"};
-}
-
-#
-# Make a pass through the input file and download any web pages that
-# are included by reference.
-#
-foreach (@lines) {
-	chomp;
-	if (/^<!-- #include (.+) -->$/) {
-		my $url = $1;
-		print "Getting $url\n";
-		# Download the page into $content{$url}.
-		$content{$url} =
-		    `/usr/sfw/bin/wget -q -O - -T $timeout -t $tries $url`;
-		if (! $content{$url}) {
-			die "$url: invalid or empty URI.\n";
-		}
-		#
-		# Clean up the downloaded contents: remove carriage
-		# returns, strip out content that is outside the
-		# delimiter tags, convert HTML-encoded characters back
-		# into plain text.
-		#
-		$content{$url} =~ s/\r//g;
-		my @c = split /\n/, $content{$url};
-		my $l;
-		# Work forwards to find start.
-		while (defined ($l = shift @c)) {
-			if ($l =~ /$begin_data/) {
-				last;
-			}
-		}
-		if (! defined $l) {
-			print "Warning: content start delimiter not found\n";
-		} else {
-			# Work backwards to find end.
-			while (defined ($l = pop @c)) {
-				if ($l =~ /$end_data/) {
-					last;
-				}
-			}
-			if (! defined $l) {
-				print "Warning: content end delimiter ",
-				    "not found\n";
-			}
-		}
-		$content{$url} = join "\n", @c;
-		$content{$url} =~ s/&amp;/&/g;
-		$content{$url} =~ s/&lt;/</g;
-		$content{$url} =~ s/&#60;/</g;
-		$content{$url} =~ s/&gt;/>/g;
-		$content{$url} =~ s/&#62;/>/g;
-	}
-}
-
-#
-# Make a second pass through the input file.  Pass most text on
-# verbatim; replace #include directives with the content that was
-# downloaded by the previous pass.
-#
-foreach (@lines) {
-	if (/^<!-- #include (.+) -->$/ && exists($content{$1})) {
-		print README_OUT $content{$1};
-	} else {
-		print README_OUT "$_\n";
-	}
-}
-
-print README_OUT "\n\n";
-close(README_OUT);
diff --git a/usr/src/tools/scripts/mktpl.pl b/usr/src/tools/scripts/mktpl.pl
deleted file mode 100644
index 15787e2288..0000000000
--- a/usr/src/tools/scripts/mktpl.pl
+++ /dev/null
@@ -1,148 +0,0 @@
-#! /usr/bin/perl -w
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# Create THIRDPARTYLICENSE files using the index file in $CODEMGR_WS.
-#
-
-use Cwd;
-use Env;
-use strict;
-use vars qw($opt_c);
-use Getopt::Std;
-
-# -c: only generate crypto license file
-my $usage = "mktpl [-c] license-list-file";
-
-my $top = $ENV{"CODEMGR_WS"};
-if (! $top) {
-	die "CODEMGR_WS must be set.\n";
-}
-
-if (! getopts('c')) {
-	die "usage: $usage\n";
-}
-if (@ARGV != 1) {
-	die "usage: $usage\n";
-}
-
-my $indexfile = $ARGV[0];
-
-my $exitstatus = 0;
-
-#
-# Create a THIRDPARTYLICENSE file from the given license list and suffix.
-#
-sub maketpl {
-	my ($suffix, @tpllist) = @_;
-	my $licnum = 1;
-	my $tplname = "$top/THIRDPARTYLICENSE.$suffix";
-
-	if (! @tpllist) {
-		unlink $tplname;
-		return;
-	}
-
-	open(TPL, ">$tplname") or die "Can't create $tplname: $!\n";
-
-	print TPL "DO NOT TRANSLATE OR LOCALIZE.\n\n";
-
-	foreach my $licfile (@tpllist) {
-		my $descrip = `cat "$licfile.descrip"`;
-		if (! $descrip) {
-			warn "Missing description for $licfile\n";
-			$exitstatus = 1;
-			$descrip = "(MISSING DESCRIPTION for $licfile)\n";
-		}
-		print TPL "$licnum)  The following software may be included ",
-		    "in this product:\n\n";
-		print TPL "\t$descrip\n";
-		print TPL "    Use of this software is governed by the ",
-		    "terms of the following license:\n";
-		print TPL "\n";
-		if (open(LIC, "<$licfile")) {
-			while (<LIC>) {
-				print TPL "    " . $_;
-			}
-			close LIC;
-		} else {
-			warn "Can't open $licfile: $!\n";
-			$exitstatus = 1;
-			print TPL "    (MISSING LICENSE: $licfile)\n";
-		}
-		print TPL "\n";
-		$licnum++;
-	}
-
-	close TPL or die "I/O error on $tplname: $!\n";
-}
-
-#
-# Return non-zero if we expect the crypto for the given
-# third-party license file to be signed.  Else, return zero.
-#
-my $hashes = qr"/(rng|md4|md5|sha1/sha2)/";
-sub signedcrypto {
-	my ($licpath) = @_;
-
-	return 0 if $licpath =~ m#$hashes#;
-	return 1;
-}
-
-#
-# Make file list for each TPL file.
-#
-
-chdir($top) or die "Can't chdir to $top: $!\n";
-$top = getcwd();
-
-my $isclosed = qr"^usr/closed";
-my $iscrypto = qr"(^usr/src/common/crypto)|(^usr/src/lib/pkcs11)";
-
-my @closedlist;
-my @cryptolist;
-
-open(IX, "<$indexfile") or die "Can't open $indexfile: $!\n";
-while (<IX>) {
-	chomp;
-	my $lic = $_;
-	if (! $opt_c && $lic =~ /$isclosed/) {
-		push @closedlist, $lic;
-	}
-	if ($lic =~ /$iscrypto/ && signedcrypto($lic)) {
-		push @cryptolist, $lic;
-	}
-}
-close IX;
-
-#
-# Generate each TPL file.
-#
-
-maketpl("ON-BINARIES", @closedlist);
-maketpl("ON-CRYPTO", @cryptolist);
-
-exit $exitstatus;
diff --git a/usr/src/tools/scripts/wx2hg.1 b/usr/src/tools/scripts/wx2hg.1
deleted file mode 100644
index 6bb605c532..0000000000
--- a/usr/src/tools/scripts/wx2hg.1
+++ /dev/null
@@ -1,238 +0,0 @@
-.\" 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.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
-.\"
-.\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-.\" Use is subject to license terms.
-.\"
-.\" ident	"%Z%%M%	%I%	%E% SMI"
-.TH wx2hg 1 "29 Jul 2008"
-.SH NAME
-.I wx2hg
-\- Convert a wx-managed workspace to Mercurial.
-.SH SYNOPSIS
-.B wx2hg
-[ \fB\-u\fR ]
-[ \fB\-r\fR \fIhg_rev\fR ]
-[ \fB\-t\fR \fIhg_ws\fR ]
-\fItw_ws\fR
-.LP
-.SH DESCRIPTION
-.I wx2hg
-takes a Teamware workspace
-and converts it to a workspace that is managed by
-Mercurial.  It is aimed at OS/Net projects that were started under
-Teamware but which expect to deliver into a
-Mercurial gate.  As such, it assumes the following usage model:
-.LP
-Suppose that you have a project workspace, which has some changes
-relative to its parent workspace.
-.I wx2hg
-checks for the existence of, and creates if necessary,
-a Mercurial workspace called
-\fItw_ws\fR\-hg that is in sync with the Mercurial twin
-of its parent workspace.
-Then it applies the changes from your project workspace to this Mercurial
-workspace.
-You can review the changes
-before committing them.  Note that any
-intermediate deltas will be lost; note also that your child workspace
-must be up-to-date with respect to the parent.
-.LP
-.I wx2hg
-uses 
-.BR wx (1)
-to determine which files have been renamed or altered.  If your
-workspace is not already controlled by
-.BR wx (1),
-.I wx2hg
-puts it under
-.BR wx (1)
-control.  If your workspace is already under 
-.BR wx (1)
-control,
-.I wx2hg
-runs 
-.BR wx update
-to ensure that the
-.BR wx (1)
-state files are up-to-date.  This step can take a while.  If you are
-sure that 
-.BR wx (1)
-already has the right list of files, you can skip this step by using
-the
-.B \-u
-option.
-.LP
-You can use the
-.B \-t
-.I hg_ws
-option to name the Mercurial target workspace, rather than having
-.I wx2hg
-default to using \fItw_ws\fR\-hg.  
-.LP
-.I wx2hg
-checks the Mercurial workspace against the Teamware parent.  If it
-finds a discrepancy, it assumes that the Teamware parent corresponds
-to an older revision within the mercurial workspace.  You must rerun 
-.I wx2hg 
-and use the
-.B \-r 
-.I hg_rev
-option to specify that revision.  (See below for more discussion on
-recovery from errors.)
-With the 
-.B \-r
-option,
-.I wx2hg
-updates the Mercurial working directory
-to that older revision and then applies your
-changes.  You will need to use mercurial to merge your changes with
-later changes in the workspace before pushing your changes to a parent
-workspace.
-.LP
-.I wx2hg
-exits with an error if it detects a rename conflict.
-.LP
-If 
-.I wx2hg
-exits with an error, you can discard any changes made prior to the
-error, then use the
-.B \-t
-option to reuse the workspace.  To discard changes made prior to the
-error, use this command:
-.LP
-.RS 5
-hg \-R \fIhg_ws\fR update \-C
-.RE
-.LP
-.SH OPTIONS
-.IP "\fB\-r\fR \fIhg_rev\fR" 10
-Use
-.I hg_rev
-as the Mercurial changeset that corresponds to the point
-in time at which your teamware workspace was synchronized with its parent.
-If you don't have any nested repositories, you may specify
-.I hg_rev
-as a changeset id or a Mercurial tag.  If you have nested repositories,
-like usr/closed in ON, then you should specify a Mercurial tag common to
-both (or all) repositories.  This tag may be local (ie a local tag that you
-create yourself using \fIhg tag -l\fR) or version controlled (ie a tag
-that the gatekeepers created, such as \fIonnv_96\fR).
-If you use
-.I hg_rev
-without specifying \fIhg_ws\fR, then the tags must resolve correctly
-in the Mercurial twin(s) of your Teamware parent.
-If you use
-.I hg_rev
-in conjunction with \fIhg_ws\fR, then the tags must resolve correctly
-in your existing Mercurial repositories.
-.IP "\fB\-t\fR \fIhg_ws\fR" 10
-Use an existing Mercurial workspace as the target, rather than
-creating one.  If you use an existing workspace, you must also create any
-nested repositories (like usr/closed) before running wx2hg.
-.IP
-If omitted, 
-.I tw_ws
-must be a child of /ws/onnv-clone, and
-.I wx2hg
-will create the Mercurial workspace \fItw_ws\fR\-hg.
-.IP \fB\-u\fR
-Skip the "wx update" step if the workspace is already under
-.BR wx (1)
-control.
-.LP
-.SH SEE ALSO
-.BR hg "(1), " wx (1)
-.LP
-.SH DIAGNOSTICS
-.LP
-wx2hg: 
-.I tw_parent
-is not recognized as a gate; please provide a Mercurial workspace (-t
-hg_ws) that matches it.
-.LP
-.RS 5
-This means that 
-.I tw_parent
-does not contain a Codemgr_wsdata/hg_twin file pointing at its mercurial
-equivalent.  If necessary, you may reparent
-.I tw_ws
-to a workspace that specifies an hg_twin
-and rerun 
-.IR wx2hg .
-Otherwise, you must use the
-.B \-t
-option to specify an existing
-Mercurial workspace whose contents matches the parent of
-.IR tw_ws .
-.RE
-.LP
-teamware parent ... doesn't match its mercurial twin
-.LP
-.RS 5
-.I wx2hg
-detected an unexpected difference between the Teamware parent and the
-Mercurial workspace.  This likely means that the parent of your
-teamware workspace is not in synch with the mercurial parent.  In that
-case, ask the maintainer of the parent workspace to resynchronize
-them, or use
-.B \-r
-to specify a revision of the Mercurial workspace that matches the
-Teamware parent.
-.RE
-.LP
-wx2hg will only migrate checked-in files; please check in these files with wx
-ci and try again
-.LP
-.RS 5
-In order to minimize spurious conflicts due to SCCS keyword
-substitution, 
-.I wx2hg
-only migrates changes in checked-in files.  Please check in your
-changes with 
-.I wx delget
-prior to migration.
-.RE
-.SH FILES
-.IP \fItw_ws\fR/Codemgr_wsdata/hg_twin
-is read by wx2hg from the parent workspace of the teamware workspace
-being converted in order to find the mercurial equivalent of that
-workspace.  The first line of hg_twin contains the URL of the
-mercurial equivalent workspace.  Since a single teamware workspace may
-be split into multiple mercurial repositories, the 2nd and subsequent
-lines of the file contain the relative paths within the first
-repository of additional child repositories.  The maintainer of a gate
-being converted is responsible for creating this file to allow
-teamware children of the teamware gate to be converted into mercurial
-children of the mercurial gate.
-.RE
-.SH BUGS
-If a file is both renamed and updated, doing an "hg diff" in the
-Mercurial workspace will
-show the entire (new) contents of the file, not just the updates.
-.LP
-There is no attempt at automated recovery in case of a rename
-conflict.
-.LP
-If a Teamware workspace is split into multiple Mercurial twin
-workspaces (as is the case with the ON closed source tree), then
-Teamware filemv commands that result in moving across repository
-boundaries will result in file removal from the source repository and
-file addition to the destination repository.  So a webrev will not
-show changes to such files, merely entire old and new contents.