353 Remove Non-redistributable package/manifests

Reviewed by: garrett@nexenta.com, trisk@opensolaris.org
Approved by: gwr@nexenta.com

30 files changed, 13 insertions, 899 deletions

diff --git a/usr/src/Makefile b/usr/src/Makefile
index 0bcd5533ce..836d0a442f 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -312,7 +312,6 @@ CRYPT_SRC:
 	@cd uts/common/gssapi/include;    pwd; $(MAKE) CRYPT_SRC
 	@cd uts/common/gssapi/mechs/dummy;        pwd; $(MAKE) CRYPT_SRC
 	@cd uts/common/gssapi/mechs/krb5; pwd; $(MAKE) CRYPT_SRC
-	@cd pkg;    pwd; $(MAKE) CRYPT_SRC
 	$(RM) Makefile+
 	sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
 			< Makefile > Makefile+
diff --git a/usr/src/cmd/pfexec/Makefile b/usr/src/cmd/pfexec/Makefile
index 8000980f59..f43c35a3e0 100644
--- a/usr/src/cmd/pfexec/Makefile
+++ b/usr/src/cmd/pfexec/Makefile
@@ -49,8 +49,6 @@ install: all $(ROOTBINPFEXEC)
 	$(SYMLINK) ../usr/bin/pfexec $(ROOTSBIN)/pfsh
 	$(RM) $(ROOTHASBIN)/pfsh
 	$(LN) $(ROOTBIN)/pfexec $(ROOTHASBIN)/pfsh
-	$(RM) $(ROOTHASBIN)/pfksh
-	$(LN) $(ROOTBIN)/pfexec $(ROOTHASBIN)/pfksh
 
 clean:
 
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 3e1538a8d0..49bd8b8ef3 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -97,26 +97,6 @@ TOOLSROOT=	$(TOOLSROOT.cmd:sh)
 PKGDEST.cmd=	print $(PKGARCHIVE) | sed -e s:/$(MACH)/:/$(PKGMACH)/:
 PKGDEST=	$(PKGDEST.cmd:sh)
 
-#
-# The publish transforms, EXCEPTIONS list, and some manifests need to
-# know when we're building open-only and when we're using internal
-# crypto bits.
-#
-# We only use internal crypto when we're doing a closed build, the
-# CODESIGN_USER env variable is not set, and ON_CRYPTO_BINS is not set.
-# This matches the conditions under which the internal key and cert
-# are needed for the packaged objects.
-#
-$(CLOSED_BUILD)OPEN_ONLY_BUILD= $(POUND_SIGN)
-
-USE_INTERNAL_CRYPTO= $(POUND_SIGN)
-UI1= $(CODESIGN_USER:%=$(POUND_SIGN))
-$(UI1)UI2= $(ON_CRYPTO_BINS:%=$(POUND_SIGN))
-$(CLOSED_BUILD)USE_INTERNAL_CRYPTO= $(UI1)$(UI2)
-USE_SIGNED_CRYPTO=
-$(USE_INTERNAL_CRYPTO)USE_SIGNED_CRYPTO= $(POUND_SIGN)
-
-
 EXCEPTIONS= packaging
 
 PKGMOGRIFY= pkgmogrify
@@ -131,7 +111,6 @@ PKGMOGRIFY= pkgmogrify
 # tarball.  See usr/src/tools/scripts/bindrop.sh for details.
 #
 REPOS= redist
-$(CLOSED_BUILD)REPOS += extra
 
 #
 # The packages directory will contain the processed manifests as
@@ -150,7 +129,6 @@ PDIR= packages.$(PKGMACH)
 $(PDIR)/developer-build-onbld.dep:= PKGROOT= $(TOOLSROOT)
 
 PKGPUBLISHER= $(PKGPUBLISHER_REDIST)
-$(PKGDEST)/repo.extra:= PKGPUBLISHER= $(PKGPUBLISHER_NONREDIST)
 
 #
 # To get these defaults, manifests should simply refer to $(PKGVERS).
@@ -196,11 +174,7 @@ PKGMOG_DEFINES= \
 	PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
 	PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 	PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
-	PKGVERS=$(PKGVERS) \
-	CLOSED_BUILD=$(CLOSED_BUILD) \
-	OPEN_BUILD=$(OPEN_ONLY_BUILD) \
-	USE_INTERNAL_CRYPTO=$(USE_INTERNAL_CRYPTO) \
-	USE_SIGNED_CRYPTO=$(USE_SIGNED_CRYPTO)
+	PKGVERS=$(PKGVERS)
 
 PKGDEP_TOKENS_i386= \
 	'PLATFORM=i86hvm' \
@@ -220,7 +194,7 @@ PKGDEP_TOKENS= $(PKGDEP_TOKENS_$(PKGMACH))
 # dependency types, so that they can be included by either an
 # incorporation or a group package.
 #
-$(PDIR)/osnet-redist.mog $(PDIR)/osnet-extra.mog:= PKGDEP_TYPE= require
+$(PDIR)/osnet-redist.mog := PKGDEP_TYPE= require
 $(PDIR)/osnet-incorporation.mog:= PKGDEP_TYPE= incorporate
 
 PKGDEP_INCORP= \
@@ -249,7 +223,6 @@ PROC_PKGS= $(PKGS:%=$(PDIR)/%.mog)
 # different sets of transforms and macros for pkgmogrify.
 #
 SYNTH_PKGS= osnet-incorporation osnet-redist
-$(CLOSED_BUILD)SYNTH_PKGS += osnet-extra
 DEP_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.dep)
 PROC_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.mog)
 
@@ -497,12 +470,7 @@ $(REPOS:%=$(PKGDEST)/repo.%):
 #   target file ($@) in place, or make will reprocess the package
 #   every time it encounters it as a dependency.  Hence the "touch"
 #   statement to ensure that the target is created, even when
-#   pkgmogrify encounters an abort in the publish transforms.  This
-#   will not cause publication failures when switching build
-#   environments, because $(CLOSED_BUILD) and $(OPEN_ONLY) are
-#   referenced in $(PKGMOG_DEFINES), and changes will therefore
-#   trigger a rebuild for command dependency failure.  (Command
-#   dependency checking is turned on by .KEEP_STATE: above.)
+#   pkgmogrify encounters an abort in the publish transforms.
 #
 
 .SUFFIXES: .mf .mog .dep .res .pub
@@ -748,11 +716,9 @@ XMOD_PKGS= \
 	BRCMbnx \
 	BRCMbnxe \
 	SUNWadpu320 \
-	SUNWcryptoint \
 	SUNWibsdpib \
 	SUNWkdc \
 	SUNWlsimega \
-	SUNWsvvs \
 	SUNWwbint \
 	SUNWwbsup
 
@@ -763,12 +729,4 @@ EXPORT_SRC: CRYPT_SRC
 		< Makefile > Makefile+
 	$(MV) -f Makefile+ Makefile
 	$(CHMOD) 444 Makefile
-
-CRYPT_SRC:
-	$(RM) manifests/SUNWcryptoint.mf+
-	$(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \
-		< manifests/SUNWcryptoint.mf > manifests/SUNWcryptoint.mf+
-	$(MV) manifests/SUNWcryptoint.mf+ manifests/SUNWcryptoint.mf
-	$(CHMOD) 444 manifests/SUNWcryptoint.mf
-
 # EXPORT DELETE END
diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg
index 71179cc0ab..823e3cf152 100644
--- a/usr/src/pkg/README.pkg
+++ b/usr/src/pkg/README.pkg
@@ -34,36 +34,21 @@ is confusing, you may wish to review the pkg(5) manpage.
 Packaging Overview
 ------------------
 
-usr/src/pkg/ contains the definitions and rules needed to build
-a set of IPS repositories which contain the deliverables from an
-ON build.
+usr/src/pkg/ contains the definitions and rules needed to build an IPS
+repository which contain the deliverables from an ON build.
 
 The manifests directory contains all manifests, and has one file
 per package.  For most packaging changes you only need to add or
 change the packaging manifests themselves.
 
-The build rules create two repositories.  These are both built
-for DEBUG and non-DEBUG, and are thus available at
-    $CODEMGR_WS/packages/$MACH/nightly[-nd]/repo.(extra|redist)
-
-	repo.redist
-	    Contains the bulk of ON, and is what is delivered to the
-	    main OpenSolaris 'dev' and 'release' repositories.  All
-	    components delivered there must be redistributable.
-
-	repo.extra
-	    Is only built for Closed builds, and contains
-	    non-redistributable (without a proper legal agreement) pieces
-	    which may or may not be suitable for inclusion in the
-	    pkg.sun.com/opensolaris/extra repository, including the
-	    internal crypto bits necessary for working crypto in a Closed
-	    build.  Do not distribute any of the bits in repo.extra
-	    without prior agreement from the appropriate lawyers.
+The build rules create a package repository.  Separate DEBUG and
+non-DEBUG versions are built, and are available at:
+    $CODEMGR_WS/packages/$MACH/nightly[-nd]/repo.redist
 
 Building Packages
 -----------------
 
-The -p option to nightly will build the IPS repositories.
+The -p option to nightly will build the IPS repository.
 
 Alternatively, in usr/src/pkg/Makefile there are make targets for:
 
@@ -89,23 +74,6 @@ Alternatively, in usr/src/pkg/Makefile there are make targets for:
 
 The build behavior may modified by the following variables:
 
-	CLOSED_IS_PRESENT
-	    If CLOSED_IS_PRESENT is set to "yes," repo.extra will be built.
-
-	ON_CRYPTO_BINS or CODESIGN_USER
-	    If ON_CRYPTO_BINS or CODESIGN_USER is set in your build env,
-	    no packages will depend on the internal crypto certificates.
-
-	    If neither is set, your bits depend on the internal crypto
-	    certificates being available and packages will depend on
-	    pkg:/driver/crypto/dprov, which is only available in the
-	    on-extra repository.
-
-	    *** Important *** This means that, if you build using
-	    internal crypto, but you try to do an image-update with
-	    only repo.redist, you will be told that there are no  
-	    updates available.
-
 	SUPPRESSPKGDEP
 	    If SUPPRESSPKGDEP is set to "true" in your environment,
 	    package dependencies will not be generated.  This variable
@@ -177,13 +145,13 @@ Incremental Builds
 Testing Packages
 ----------------
 
-To test the generated repositories, you should use the "onu" tool
+To test the generated repository, you should use the "onu" tool
 available from /opt/onbld/bin or usr/src/tools/scripts/ to setup and
 upgrade your system.  A manpage is available in /opt/onbld/man
 or usr/src/tools/scripts/onu.1.
 
 Alternatively, you can manually start a pkg.depot(1M) server to
-serve the generated repositories to multiple test machines.
+serve the generated repository to multiple test machines.
 
 	Start up a depot on your build machine.
 	    cd $CODEMGR_WS/packages/$MACH/nightly[-nd]
@@ -195,20 +163,11 @@ serve the generated repositories to multiple test machines.
 	    The depot can be started across NFS as well if you
 	    have a fast pipe.
 
-	    If you used internal crypto in your builds, then you must
-	    do this step for both repo.redist and repo.extra, picking
-	    different ports for each.  Otherwise, you will be unable to
-	    image-update.
-
 	Configure your test system.
 	    pkg set-publisher -P -g http://<your server host>:<port> on-nightly
 	    pkg set-publisher --non-sticky opensolaris.org
 	    pkg uninstall entire
 
-	    If you used internal crypto in your builds, then you must also:
-	        pkg set-publisher -P \
-		    -g http://<your server host>:<extra-port> on-extra
-
 	pkg image-update your test system.
 	    pkg image-update will upgrade all packages on your test system
 
@@ -232,12 +191,6 @@ There are various tactics for troubleshooting a failed upgrade.
 	    pkg search -l ::pkg.renamed:true
 	    pkg search -l ::pkg.obsolete:true
 
-	Check to see if you used internal crypto, but failed to provide
-	a server for repo.extra.
-	    Use a web browser to view the system/kernel manifest from
-	    your on-nightly publisher and look for a dependency on the
-	    driver/crypto/dprov package.
-
 
 Making Packaging Changes
 ------------------------
@@ -281,8 +234,7 @@ read pkmogrify(1) and the files themselves.
 	publish
 	    This transform is applied to all manifests.  It ensures
 	    that manifest lines which don't apply to the current
-	    architecture are stripped.  It also ensures non-redistributable
-	    packages aren't included in an open-only build.
+	    architecture are stripped.
 
 	restart_fmri
 	    This transform is applied to all manifests.  It modifies
@@ -296,7 +248,7 @@ read pkmogrify(1) and the files themselves.
 	extract_metadata
 	    This transform is applied to all manifests.  It deals with
 	    manipulations required for packaging metadata like
-	    org.opensolaris.redist, pkg.renamed, and pkg.obsolete.
+	    pkg.renamed, and pkg.obsolete.
 
 	hollow_zone_pkg
 	    This transform is available for explicit inclusion in
@@ -438,8 +390,6 @@ follows:
 	    package you are obsoleting.  Note that you must obsolete a
 	    package on all architectures and variants simultaneously.
 
-	Maintain 'set name=org.opensolaris.redist' actions if present.
-
 	Delete everything else.
 
 	If the package is a renamed ancestor, leave a comment behind as
@@ -497,16 +447,6 @@ The following actions are required for all packages in ON.
 	    usr/src/pkg/license_files, then you will also need to modify 
 	    usr/src/tools/opensolaris/license-list.
 
-The following actions are uncommon but specific to ON.
-
-	set name=org.opensolaris.redist
-	    This may be set to nonredist or internal.  If a package
-	    is redistributable, do not create this action.  "internal"
-	    packages which are legally not allowed to be distributed
-	    at all are strongly discouraged.  If you're adding
-	    content to a package with this action, you should have
-	    modified bindrop.sh, and test open-only builds.
-
 You don't need to set the following.  They're taken care of for all OS/Net
 packages in the transforms/common_actions file.
 
diff --git a/usr/src/pkg/manifests/SUNWbmc.mf b/usr/src/pkg/manifests/SUNWbmc.mf
deleted file mode 100644
index 5a4c1982a9..0000000000
--- a/usr/src/pkg/manifests/SUNWbmc.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWbmc@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=i386
-depend fmri=pkg:/driver/management/bmc@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWcryptoint.mf b/usr/src/pkg/manifests/SUNWcryptoint.mf
deleted file mode 100644
index ba62dbba86..0000000000
--- a/usr/src/pkg/manifests/SUNWcryptoint.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWcryptoint@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=internal
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/crypto/dprov@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWifp.mf b/usr/src/pkg/manifests/SUNWifp.mf
deleted file mode 100644
index b7a34c3baf..0000000000
--- a/usr/src/pkg/manifests/SUNWifp.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWifp@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-depend fmri=pkg:/driver/storage/ifp@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWifph.mf b/usr/src/pkg/manifests/SUNWifph.mf
deleted file mode 100644
index 407a5aa9f3..0000000000
--- a/usr/src/pkg/manifests/SUNWifph.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWifph@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-depend fmri=pkg:/system/header/header-ifp@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWisp.mf b/usr/src/pkg/manifests/SUNWisp.mf
deleted file mode 100644
index cf5411c86f..0000000000
--- a/usr/src/pkg/manifests/SUNWisp.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWisp@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-depend fmri=pkg:/driver/storage/isp@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWonmtst.mf b/usr/src/pkg/manifests/SUNWonmtst.mf
deleted file mode 100644
index ab026112a4..0000000000
--- a/usr/src/pkg/manifests/SUNWonmtst.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWonmtst@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=internal
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/fault-management/mtst@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWqus.mf b/usr/src/pkg/manifests/SUNWqus.mf
deleted file mode 100644
index 5b7b8b4086..0000000000
--- a/usr/src/pkg/manifests/SUNWqus.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWqus@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-depend fmri=pkg:/driver/storage/qus@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/SUNWspwr.mf b/usr/src/pkg/manifests/SUNWspwr.mf
deleted file mode 100644
index f69dcc48bf..0000000000
--- a/usr/src/pkg/manifests/SUNWspwr.mf
+++ /dev/null
@@ -1,31 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Was renamed to driver/network/spwr, both now obsolete.
-
-set name=pkg.fmri value=pkg:/SUNWspwr@0.5.11,5.11-0.141
-set name=pkg.obsolete value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=i386
diff --git a/usr/src/pkg/manifests/SUNWsvvs.mf b/usr/src/pkg/manifests/SUNWsvvs.mf
deleted file mode 100644
index cbece3c352..0000000000
--- a/usr/src/pkg/manifests/SUNWsvvs.mf
+++ /dev/null
@@ -1,30 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWsvvs@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=org.opensolaris.redist value=internal
-set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/tests/svr4@0.5.11,5.11-0.133 type=require
diff --git a/usr/src/pkg/manifests/driver-crypto-dca.mf b/usr/src/pkg/manifests/driver-crypto-dca.mf
index 324a196898..2eeec3f33e 100644
--- a/usr/src/pkg/manifests/driver-crypto-dca.mf
+++ b/usr/src/pkg/manifests/driver-crypto-dca.mf
@@ -65,4 +65,3 @@ legacy pkg=SUNWdcar desc="DCA Crypto Accelerator driver" \
     name="DCA Crypto Accelerator (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require
diff --git a/usr/src/pkg/manifests/driver-crypto-dprov.mf b/usr/src/pkg/manifests/driver-crypto-dprov.mf
index 80cbc9f09b..7e7de70eea 100644
--- a/usr/src/pkg/manifests/driver-crypto-dprov.mf
+++ b/usr/src/pkg/manifests/driver-crypto-dprov.mf
@@ -28,23 +28,12 @@ set name=pkg.description value="Kernel Crypto Framework Test Driver"
 set name=pkg.summary value="Kernel Crypto Framework Test Driver"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/System
-set name=org.opensolaris.redist value=internal
 set name=variant.arch value=$(ARCH)
-# CRYPT DELETE START
-dir path=etc group=sys
-dir path=etc/certs group=sys
-dir path=etc/crypto group=sys
-dir path=etc/crypto/certs group=sys
-# CRYPT DELETE END
 dir path=kernel group=sys
 dir path=kernel/crypto group=sys
 dir path=kernel/crypto/$(ARCH64) group=sys
 dir path=kernel/drv group=sys
 dir path=kernel/drv/$(ARCH64) group=sys
-file path=etc/certs/SUNWosnetSE group=sys
-file path=etc/certs/SUNWosnetSolaris group=sys
-file path=etc/crypto/certs/SUNWosnet group=sys
-file path=etc/crypto/certs/SUNWosnetCF group=sys
 file path=kernel/drv/$(ARCH64)/dprov group=sys
 $(i386_ONLY)file path=kernel/drv/dprov group=sys
 file path=kernel/drv/dprov.conf group=sys
diff --git a/usr/src/pkg/manifests/driver-management-bmc.mf b/usr/src/pkg/manifests/driver-management-bmc.mf
deleted file mode 100644
index 2c03cc5513..0000000000
--- a/usr/src/pkg/manifests/driver-management-bmc.mf
+++ /dev/null
@@ -1,45 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# The default for payload-bearing actions in this package is to appear in the
-# global zone only.  See the include file for greater detail, as well as
-# information about overriding the defaults.
-#
-<include global_zone_only_component>
-set name=pkg.fmri value=pkg:/driver/management/bmc@$(PKGVERS)
-set name=pkg.description value="IPMI Baseboard Management Controller"
-set name=pkg.summary value="IPMI Baseboard Management Controller"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/System
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=i386
-dir path=kernel group=sys
-dir path=kernel/drv group=sys
-dir path=kernel/drv/$(ARCH64) group=sys
-driver name=bmc perms="* 0666 root sys"
-file path=kernel/drv/amd64/bmc group=sys reboot_needed=true
-file path=kernel/drv/bmc group=sys reboot_needed=true
-file path=kernel/drv/bmc.conf group=sys reboot_needed=false
diff --git a/usr/src/pkg/manifests/driver-network-spwr.mf b/usr/src/pkg/manifests/driver-network-spwr.mf
deleted file mode 100644
index 2784e1d17a..0000000000
--- a/usr/src/pkg/manifests/driver-network-spwr.mf
+++ /dev/null
@@ -1,29 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/driver/network/spwr@0.5.11,5.11-0.141
-set name=pkg.obsolete value=true
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=i386
diff --git a/usr/src/pkg/manifests/driver-storage-ifp.mf b/usr/src/pkg/manifests/driver-storage-ifp.mf
deleted file mode 100644
index 17f845a9f5..0000000000
--- a/usr/src/pkg/manifests/driver-storage-ifp.mf
+++ /dev/null
@@ -1,50 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# The default for payload-bearing actions in this package is to appear in the
-# global zone only.  See the include file for greater detail, as well as
-# information about overriding the defaults.
-#
-<include global_zone_only_component>
-set name=pkg.fmri value=pkg:/driver/storage/ifp@$(PKGVERS)
-set name=pkg.description \
-    value="Sun FC-AL Device Driver For QLogic Fibre Channel Family"
-set name=pkg.summary value="Sun Fibre Channel Arbitrated Loop Device Driver"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Storage
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-dir path=kernel group=sys
-dir path=kernel/drv group=sys
-dir path=kernel/drv/$(ARCH64) group=sys
-driver name=ifp alias=pci1077,2100 perms="* 0600 root sys"
-file path=kernel/drv/$(ARCH64)/ifp group=sys
-file path=kernel/drv/ifp.conf group=sys
-legacy pkg=SUNWifp \
-    desc="Sun FC-AL Device Driver For QLogic Fibre Channel Family" \
-    name="Sun Fibre Channel Arbitrated Loop Device Driver"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-isp.mf b/usr/src/pkg/manifests/driver-storage-isp.mf
deleted file mode 100644
index 63ef4b44f4..0000000000
--- a/usr/src/pkg/manifests/driver-storage-isp.mf
+++ /dev/null
@@ -1,57 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/driver/storage/isp@$(PKGVERS)
-set name=pkg.description \
-    value="Emulex/QLogic Intelligent SCSI Processor driver for ISP 1000 and 1040A"
-set name=pkg.summary \
-    value="Emulex/QLogic Intelligent SCSI Processor driver for ISP 1000 and 1040A"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Storage
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-dir path=kernel group=sys
-dir path=kernel/drv group=sys
-dir path=kernel/drv/$(ARCH64) group=sys
-dir path=usr group=sys
-dir path=usr/include
-dir path=usr/include/sys
-dir path=usr/include/sys/scsi
-dir path=usr/include/sys/scsi/adapters
-dir path=usr/lib
-dir path=usr/lib/mdb group=sys
-dir path=usr/lib/mdb/kvm group=sys
-dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
-driver name=isp class=scsi \
-    alias=QLGC,isp \
-    alias=SUNW,isp \
-    alias=SUNW,isptwo
-file path=kernel/drv/$(ARCH64)/isp group=sys
-file path=kernel/kmdb/$(ARCH64)/isp group=sys mode=0555
-file path=usr/include/sys/scsi/adapters/ispcmd.h
-file path=usr/include/sys/scsi/adapters/ispmail.h
-file path=usr/include/sys/scsi/adapters/ispreg.h
-file path=usr/include/sys/scsi/adapters/ispvar.h
-file path=usr/lib/mdb/kvm/$(ARCH64)/isp.so group=sys mode=0555
diff --git a/usr/src/pkg/manifests/driver-storage-qus.mf b/usr/src/pkg/manifests/driver-storage-qus.mf
deleted file mode 100644
index 4d9a3f34be..0000000000
--- a/usr/src/pkg/manifests/driver-storage-qus.mf
+++ /dev/null
@@ -1,47 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# The default for payload-bearing actions in this package is to appear in the
-# global zone only.  See the include file for greater detail, as well as
-# information about overriding the defaults.
-#
-<include global_zone_only_component>
-set name=pkg.fmri value=pkg:/driver/storage/qus@$(PKGVERS)
-set name=pkg.description \
-    value="Software to support Qlogic Ultra3 scsi host bus adapters"
-set name=pkg.summary value="QLogic Ultra3 Scsi"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Storage
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-dir path=kernel group=sys
-dir path=kernel/drv group=sys
-dir path=kernel/drv/$(ARCH64) group=sys
-driver name=qus alias=pci1077,1016 class=scsi perms="* 0600 root sys"
-file path=kernel/drv/$(ARCH64)/qus group=sys
-legacy pkg=SUNWqus \
-    desc="Software to support Qlogic Ultra3 scsi host bus adapters" \
-    name="QLogic Ultra3 Scsi, (Root)"
diff --git a/usr/src/pkg/manifests/system-fault-management-mtst.mf b/usr/src/pkg/manifests/system-fault-management-mtst.mf
deleted file mode 100644
index 303cf28c7a..0000000000
--- a/usr/src/pkg/manifests/system-fault-management-mtst.mf
+++ /dev/null
@@ -1,103 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/system/fault-management/mtst@$(PKGVERS)
-set name=pkg.description \
-    value="CPU/memory error injector for internal testing"
-set name=pkg.summary value="CPU/memory error injector"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/System
-set name=org.opensolaris.redist value=internal
-set name=variant.arch value=$(ARCH)
-$(i386_ONLY)dir path=kernel group=sys
-$(i386_ONLY)dir path=kernel/drv group=sys
-$(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys
-dir path=platform group=sys
-$(sparc_ONLY)dir path=platform/sun4u group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)dir path=platform/sun4v group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
-dir path=usr group=sys
-dir path=usr/bin
-$(i386_ONLY)dir path=usr/include
-$(i386_ONLY)dir path=usr/include/sys
-dir path=usr/platform group=sys
-$(i386_ONLY)dir path=usr/platform/i86pc group=sys
-$(i386_ONLY)dir path=usr/platform/i86pc/lib
-$(i386_ONLY)dir path=usr/platform/i86pc/lib/mtst
-$(sparc_ONLY)dir path=usr/platform/sun4u group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/include
-$(sparc_ONLY)dir path=usr/platform/sun4u/include/sys
-$(sparc_ONLY)dir path=usr/platform/sun4v group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/include
-$(sparc_ONLY)dir path=usr/platform/sun4v/include/sys
-driver name=memtest perms="* 0660 root sys"
-$(i386_ONLY)file path=kernel/drv/$(ARCH64)/memtest group=sys
-$(i386_ONLY)file path=kernel/drv/memtest group=sys
-$(i386_ONLY)file path=kernel/drv/memtest.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/memtest group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/memtest.conf group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/memtest group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/memtest.conf group=sys
-file path=usr/bin/mtst mode=0555
-$(i386_ONLY)file path=usr/include/sys/memtest.h group=sys
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mtst/mtst_AuthenticAMD.so
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mtst/mtst_AuthenticAMD_15.so
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mtst/mtst_GenuineIntel.so
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mtst/mtst_generic.so
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_ch.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_chp.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_ja.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_jg.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_oc.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_pn.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_sf.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_sr.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memtestio_u.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio_kt.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio_n2.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio_ni.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio_v.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio_vf.h
-$(i386_ONLY)legacy pkg=SUNWonmtst.i arch=$(ARCH).i86pc category=internal \
-    desc="CPU/memory error injector for internal testing" \
-    hotline="Please contact fma-interest@sun.com" \
-    name="CPU/memory error injector"
-$(sparc_ONLY)legacy pkg=SUNWonmtst.u arch=$(ARCH).sun4u category=internal \
-    desc="CPU/memory error injector for internal testing" \
-    hotline="Please contact fma-interest@sun.com" \
-    name="CPU/memory error injector"
-$(sparc_ONLY)legacy pkg=SUNWonmtst.v arch=$(ARCH).sun4v category=internal \
-    desc="CPU/memory error injector for internal testing" \
-    hotline="Please contact ei-support@sun.com" \
-    name="CPU/memory error injector"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-header-header-ifp.mf b/usr/src/pkg/manifests/system-header-header-ifp.mf
deleted file mode 100644
index 6a4bacafe9..0000000000
--- a/usr/src/pkg/manifests/system-header-header-ifp.mf
+++ /dev/null
@@ -1,46 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/system/header/header-ifp@$(PKGVERS)
-set name=pkg.description value="SunOS Header Files For QLogic FC-AL Family"
-set name=pkg.summary \
-    value="Sun Fibre Channel Arbitrated Loop Driver Header Files"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Storage
-set name=org.opensolaris.redist value=nonredist
-set name=variant.arch value=sparc
-dir path=usr group=sys
-dir path=usr/include
-dir path=usr/include/sys
-dir path=usr/include/sys/scsi
-dir path=usr/include/sys/scsi/adapters
-file path=usr/include/sys/scsi/adapters/ifpcmd.h
-file path=usr/include/sys/scsi/adapters/ifpmail.h
-file path=usr/include/sys/scsi/adapters/ifpreg.h
-file path=usr/include/sys/scsi/adapters/ifpvar.h
-legacy pkg=SUNWifph desc="SunOS Header Files For QLogic FC-AL Family" \
-    name="Sun Fibre Channel Arbitrated Loop Driver Header Files"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf
index 832fb7468c..5fcff626ca 100644
--- a/usr/src/pkg/manifests/system-kernel.mf
+++ b/usr/src/pkg/manifests/system-kernel.mf
@@ -872,4 +872,3 @@ link path=dev/dld target=../devices/pseudo/dld@0:ctl
 link path=kernel/misc/$(ARCH64)/des \
     target=../../../kernel/crypto/$(ARCH64)/des
 $(i386_ONLY)link path=kernel/misc/des target=../../kernel/crypto/des
-$(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 52ffce5474..e5f36979f7 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -1182,7 +1182,6 @@ link path=usr/lib/straddr.so target=./straddr.so.2
 link path=usr/xpg4/lib/$(ARCH64)/libcurses.so target=libcurses.so.2
 link path=usr/xpg4/lib/64 target=$(ARCH64)
 link path=usr/xpg4/lib/libcurses.so target=./libcurses.so.2
-$(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require
 depend fmri=runtime/python-26 type=require
 #
 # libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/,
diff --git a/usr/src/pkg/manifests/system-tests-svr4.mf b/usr/src/pkg/manifests/system-tests-svr4.mf
deleted file mode 100644
index b62c94e51a..0000000000
--- a/usr/src/pkg/manifests/system-tests-svr4.mf
+++ /dev/null
@@ -1,72 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/system/tests/svr4@$(PKGVERS)
-set name=pkg.description value="System V Verification Suite Drivers"
-set name=pkg.summary value="System V Verification Suite Drivers"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/System
-set name=org.opensolaris.redist value=internal
-set name=variant.arch value=$(ARCH)
-dir path=usr group=sys
-dir path=usr/include
-dir path=usr/include/sys
-dir path=usr/kernel group=sys
-dir path=usr/kernel/drv group=sys
-dir path=usr/kernel/drv/$(ARCH64) group=sys
-dir path=usr/kernel/strmod group=sys
-dir path=usr/kernel/strmod/$(ARCH64) group=sys
-driver name=svvslo perms="* 0666 root sys"
-driver name=tidg clone_perms="* 0666 root sys"
-driver name=tivc clone_perms="* 0666 root sys"
-driver name=tmux clone_perms="* 0666 root sys"
-file path=usr/include/sys/svvslo.h
-file path=usr/include/sys/tidg.h
-file path=usr/include/sys/tivc.h
-file path=usr/include/sys/tmux.h
-file path=usr/kernel/drv/$(ARCH64)/svvslo group=sys
-file path=usr/kernel/drv/$(ARCH64)/tidg group=sys
-file path=usr/kernel/drv/$(ARCH64)/tivc group=sys
-file path=usr/kernel/drv/$(ARCH64)/tmux group=sys
-$(i386_ONLY)file path=usr/kernel/drv/svvslo group=sys
-file path=usr/kernel/drv/svvslo.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tidg group=sys
-file path=usr/kernel/drv/tidg.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tivc group=sys
-file path=usr/kernel/drv/tivc.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tmux group=sys
-file path=usr/kernel/drv/tmux.conf group=sys
-file path=usr/kernel/strmod/$(ARCH64)/lmodb group=sys mode=0755
-file path=usr/kernel/strmod/$(ARCH64)/lmode group=sys mode=0755
-file path=usr/kernel/strmod/$(ARCH64)/lmodr group=sys mode=0755
-file path=usr/kernel/strmod/$(ARCH64)/lmodt group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/lmodb group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/lmode group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/lmodr group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/lmodt group=sys mode=0755
-legacy pkg=SUNWsvvs desc="System V Verification Suite Drivers" \
-    name="System V Verification Suite Drivers"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/osnet-extra.mf b/usr/src/pkg/osnet-extra.mf
deleted file mode 100644
index 4adf2e1b09..0000000000
--- a/usr/src/pkg/osnet-extra.mf
+++ /dev/null
@@ -1,32 +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 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-set name=pkg.fmri value=pkg:/consolidation/osnet/osnet-extra@$(PKGVERS)
-set name=variant.arch value=$(ARCH)
-set name=org.opensolaris.redist value=nonredist
-set name=pkg.description value="This group package installs all packages from the OS/Net consolidation."
-set name=pkg.summary value="OS/Net consolidation group package"
-<include packages.extra.current>
diff --git a/usr/src/pkg/osnet-incorporation.mf b/usr/src/pkg/osnet-incorporation.mf
index 7c68702bf4..bd079564cf 100644
--- a/usr/src/pkg/osnet-incorporation.mf
+++ b/usr/src/pkg/osnet-incorporation.mf
@@ -32,6 +32,3 @@ set name=pkg.depend.install-hold value=core-os.osnet
 <include packages.redist.current>
 <include packages.redist.renamed>
 <include packages.redist.obsolete>
-$(CLOSED_BUILD)<include packages.extra.current>
-$(CLOSED_BUILD)<include packages.extra.renamed>
-$(CLOSED_BUILD)<include packages.extra.obsolete>
diff --git a/usr/src/pkg/transforms/extract_metadata b/usr/src/pkg/transforms/extract_metadata
index 64f45192fd..172aab7e41 100644
--- a/usr/src/pkg/transforms/extract_metadata
+++ b/usr/src/pkg/transforms/extract_metadata
@@ -24,12 +24,6 @@
 #
 
 #
-# All nonredistributable packages go to extra, for the purposes of the
-# osnet build.
-#
-<transform set name=org.opensolaris.redist value=nonredist|internal -> print REPO=extra>
-
-#
 # Pull out the license paths for staging in the proto area.  Ignore
 # those with no path separators, as that indicates a file kept in
 # $SRC/pkg/license_files, rather than alongside the associated source.
diff --git a/usr/src/pkg/transforms/publish b/usr/src/pkg/transforms/publish
index ce719ce6b6..5cf1b5ecac 100644
--- a/usr/src/pkg/transforms/publish
+++ b/usr/src/pkg/transforms/publish
@@ -41,11 +41,6 @@
 <transform set name=variant.arch value=^(?!$(ARCH)).+$ -> abort>
 
 #
-# Don't publish nonredistributable manifests in an open-only build
-#
-$(OPEN_BUILD)<transform set name=org.opensolaris.redist value=nonredist|internal -> abort>
-
-#
 # Catch don't-publish settings from manifest-embedded transforms
 #
 <transform set name=osnet.publish value=false -> abort>
diff --git a/usr/src/xmod/cry_files b/usr/src/xmod/cry_files
index 1e18c0b144..788b31e9ea 100644
--- a/usr/src/xmod/cry_files
+++ b/usr/src/xmod/cry_files
@@ -49,7 +49,6 @@ usr/src/uts/common/gssapi/mechs/krb5/mech/seal.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/unseal.c
 usr/src/uts/intel/Makefile
 usr/src/uts/sparc/Makefile
-usr/src/pkg/manifests/SUNWcryptoint.mf
 usr/src/lib/libsasl/Makefile
 usr/src/lib/libsasl/lib/common.c
 usr/src/lib/sasl_plugins/digestmd5/digestmd5.c