[illumos-gate merge]OS-8397

commit 708bde8c8780e5414779e4d9e7a7648886a4700e 14786 remove packaging support for SPARC commit 70143b9fb6146f632b4b5d924e508df293b600df 14769 remove support for Python 2.x Conflicts: manifest usr/src/cmd/mdb/Makefile.module usr/src/tools/onbld/Checks/DbLookups.py
author: Dan McDonald <danmcd@mnx.io> 2022-07-19 11:24:20 -0400
committer: Dan McDonald <danmcd@mnx.io> 2022-07-19 11:24:20 -0400
commit: 56c7f1a1c7ca3aef7200fe9d148633070f0908dc (patch)
tree: 31807a50598560c84fe979887f3b14ecf8eb7d40 /usr/src
parent: 81f8ded9e0469715043eb450f73e96578cb80240 (diff)
parent: 708bde8c8780e5414779e4d9e7a7648886a4700e (diff)
download: illumos-joyent-OS-8397.tar.gz
136 files changed, 145 insertions, 7152 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 47672f66ad..3ed49bc303 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -210,24 +210,19 @@ $(SPARC_BLD)PERL_MACH=	sun4
 PERL_VARIANT=
 PERL_ARCH=	$(PERL_MACH)-solaris$(PERL_VARIANT)-64int
 PERL_ARCH64=	$(PERL_MACH)-solaris$(PERL_VARIANT)-64
-PYTHON_VERSION=	2.7
-PYTHON_PKGVERS=	-27
-PYTHON_SUFFIX=
-PYTHON=		/usr/bin/python$(PYTHON_VERSION)
 PYTHON3_VERSION=	3.5
 PYTHON3_PKGVERS=	-35
 PYTHON3_SUFFIX=		m
-# BUILDPY3b should be overridden in the .env file in order to build the libbe
-# python module with a secondary python to aid migration between versions.
+PYTHON3=		/usr/bin/python$(PYTHON3_VERSION)
+# BUILDPY3b should be overridden in the env file in order to build python
+# modules with a secondary python to aid migration between versions.
 BUILDPY3b=		$(POUND_SIGN)
 PYTHON3b_VERSION=	3.9
 PYTHON3b_PKGVERS=	-39
 PYTHON3b_SUFFIX=
 #
-PYTHON3=		/usr/bin/python$(PYTHON3_VERSION)
 $(BUILDPY3b)PYTHON3b=	/usr/bin/python$(PYTHON3b_VERSION)
-$(BUILDPY3TOOLS)TOOLS_PYTHON=		$(PYTHON3)
-$(BUILDPY2TOOLS)TOOLS_PYTHON=		$(PYTHON)
+TOOLS_PYTHON=		$(PYTHON3)
 SORT=		/usr/bin/sort
 TR=		/usr/bin/tr
 TOUCH=		/usr/bin/touch
@@ -301,9 +296,7 @@ INS.symlink=	$(RM) $@; $(SYMLINK) $(INSLINKTARGET) $@
 # The path to python that will be used for the shebang line when installing
 # python scripts to the proto area. This is overridden by makefiles to
 # select to the correct version.
-PYSHEBANG=	$(PYTHON)
-$(BUILDPY3)PYSHEBANG=	$(PYTHON3)
-$(BUILDPY2)PYSHEBANG=	$(PYTHON)
+PYSHEBANG=	$(PYTHON3)
 
 #
 # Python bakes the mtime of the .py file into the compiled .pyc and
@@ -1269,11 +1262,6 @@ PKGPUBLISHER_NONREDIST=	on-extra
 		-e "1s:^\#!@TOOLS_PYTHON@:\#!$(TOOLS_PYTHON):" \
 		< $< > $@; $(CHMOD) +x $@
 
-.py.pyc:
-	$(RM) $@
-	$(PYTHON) -mpy_compile $<
-	@[ $(<)c = $@ ] || $(MV) $(<)c $@
-
 .py.po:
 	$(GNUXGETTEXT) $(GNUXGETFLAGS) -d $(<F:%.py=%) $< ;
 
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index 6dcd346271..7e30546e68 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -70,22 +70,7 @@ sparc_64ONLY= $(POUND_SIGN)
 
 $(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32)
 
-PYTHON2_DIRS=
-PYTHON2_64DIRS=
-PYTHON3_DIRS=
-
-$(BUILDPY2)PYTHON2_DIRS += \
-	/usr/lib/python$(PYTHON_VERSION) \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs
-
-$(BUILDPY2)PYTHON2_64DIRS += \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/64 \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/64
-
-$(BUILDPY3)PYTHON3_DIRS += \
+PYTHON3_DIRS = \
 	/usr/lib/python$(PYTHON3_VERSION) \
 	/usr/lib/python$(PYTHON3_VERSION)/vendor-packages \
 	/usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris \
@@ -326,7 +311,6 @@ DIRS= \
 	/usr/net \
 	/usr/net/servers \
 	/usr/lib/pool \
-	$(PYTHON2_DIRS) \
 	/usr/lib/rcap \
 	/usr/lib/rcap/$(MACH32) \
 	/usr/lib/sa  \
@@ -494,7 +478,6 @@ DIRS64= \
 	/usr/lib/lwp/$(MACH64) \
 	/usr/lib/mdb/kvm/$(MACH64) \
 	/usr/lib/mdb/proc/$(MACH64) \
-	$(PYTHON2_64DIRS) \
 	$(PYTHON3_DIRS) \
 	/usr/lib/rcap/$(MACH64) \
 	/usr/lib/sasl/$(MACH64) \
diff --git a/usr/src/cmd/mdb/Makefile.common b/usr/src/cmd/mdb/Makefile.common
index addce45930..10c38700ef 100644
--- a/usr/src/cmd/mdb/Makefile.common
+++ b/usr/src/cmd/mdb/Makefile.common
@@ -41,7 +41,6 @@ COMMON_MODULES_PROC = \
 	libmlsvc \
 	libnvpair \
 	libproc \
-	libpython \
 	libsysevent \
 	libtopo \
 	libumem \
@@ -52,6 +51,12 @@ COMMON_MODULES_PROC = \
 	mdb_test
 
 #
+# MDB modules used for debugging user processes which are only 64-bit
+#
+COMMON_MODULES_PROC_64BIT = \
+	libpython
+
+#
 # MDB modules used for debugging user processes which are only 32-bit
 #
 COMMON_MODULES_PROC_32BIT = \
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index 91cc124e9c..48603894b2 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -96,15 +96,9 @@ ROOTTGTS		= $(ROOTTGTS_$(MDBTGT))
 # building with an LFS python, we attempt to use -isystem when it's
 # available.
 #
-PYCPPFLAGS		= -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
-PYCPPFLAGS		+= -_cc=-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
-PYLNFLAGS		= -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
-
-#
-# At this time, we do not have python27 in the adjunct proto area, only
-# python26. As such, we explicitly override the python version dmod here.
-#
-PYTHON_VERSION		= 2.6
+PYCPPFLAGS		= -_gcc=-isystem -_gcc=$(ADJUNCT_PROTO)/usr/include/python$(PYTHON3_VERSION)$(PYTHON3_SUFFIX)
+PYCPPFLAGS		+= -_cc=-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON3_VERSION)$(PYTHON3_SUFFIX)
+PYLNFLAGS		= -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON3_VERSION)$(PYTHON3_SUFFIX)
 
 kvm_TGTFLAGS		= -D_KERNEL
 proc_TGTFLAGS		= -D_USER
diff --git a/usr/src/cmd/mdb/intel/amd64/Makefile b/usr/src/cmd/mdb/intel/amd64/Makefile
index 39d3574f15..93bb4e2fdb 100644
--- a/usr/src/cmd/mdb/intel/amd64/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/Makefile
@@ -26,7 +26,11 @@
 
 include ../../Makefile.common
 
-MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM)
+MODULES =				\
+	$(COMMON_MODULES_PROC)		\
+	$(COMMON_MODULES_PROC_64BIT)	\
+	$(COMMON_MODULES_KVM)
+
 MODULES += disk_label uhci libsmbios
 
 SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
diff --git a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
index d78b5e0fc2..7937144a67 100644
--- a/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
@@ -25,7 +25,7 @@
 
 include $(SRC)/Makefile.master
 
-MODULE = libpython$(PYTHON_VERSION).so
+MODULE = libpython$(PYTHON3_VERSION).so
 MDBTGT = proc
 MODULE_NAME = libpython
 
diff --git a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
deleted file mode 100644
index 9e19bf2e41..0000000000
--- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
+++ /dev/null
@@ -1,61 +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.
-#
-# Copyright (c) 2018, Joyent, Inc.
-
-include $(SRC)/Makefile.master
-
-MODULE = libpython$(PYTHON_VERSION).so
-MDBTGT = proc
-MODULE_NAME = libpython
-
-MODSRCS_DIR = ../../../common/modules/libpython
-
-MODSRCS = libpython.c
-
-include ../../../../Makefile.cmd
-include ../../Makefile.ia32
-include ../../../Makefile.module
-
-%.o := CPPFLAGS += $(PYCPPFLAGS)
-%.ln := CPPFLAGS += $(PYLNFLAGS)
-
-#
-# Why these? Well, the pyconfig.h header hard-codes _FILE_OFFSET_BITS
-# to 64, regardless of what we have set here.  GCC quietens this complaint via
-# use of -isystem, but neither lint nor smatch can do that.
-#
-LINTFLAGS += -erroff=E_MACRO_REDEFINED
-
-# not linted
-SMATCH=off
-
-dmod/$(MODULE) := LDLIBS += -lproc
-
-%.o: $(MODSRCS_DIR)/%.c
-	$(COMPILE.c) $<
-	$(CTFCONVERT_O)
-
-%.ln: $(MODSRCS_DIR)/%.c
-	$(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v7/libpython/Makefile b/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
deleted file mode 100644
index 06c128a1f4..0000000000
--- a/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
+++ /dev/null
@@ -1,51 +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.
-#
-
-include $(SRC)/Makefile.master
-
-MODULE = libpython$(PYTHON_VERSION).so
-MDBTGT = proc
-MODULE_NAME = libpython
-
-MODSRCS_DIR = ../../../common/modules/libpython
-
-MODSRCS = libpython.c
-
-include ../../../../Makefile.cmd
-include ../../Makefile.sparcv7
-include ../../../Makefile.module
-
-%.o := CPPFLAGS += $(PYCPPFLAGS)
-%.ln := CPPFLAGS += $(PYLNFLAGS)
-LINTFLAGS += -erroff=E_MACRO_REDEFINED
-
-dmod/$(MODULE) := LDLIBS += -lproc
-
-%.o: $(MODSRCS_DIR)/%.c
-	$(COMPILE.c) $<
-	$(CTFCONVERT_O)
-
-%.ln: $(MODSRCS_DIR)/%.c
-	$(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/sparc/v9/Makefile b/usr/src/cmd/mdb/sparc/v9/Makefile
index 74a0622f4b..944f39ea26 100644
--- a/usr/src/cmd/mdb/sparc/v9/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/Makefile
@@ -27,6 +27,7 @@ include ../../Makefile.common
 
 MODULES = \
 	$(COMMON_MODULES_PROC) \
+	$(COMMON_MODULES_PROC_64BIT)
 	$(COMMON_MODULES_KVM) \
 	intr \
 	ssd
diff --git a/usr/src/cmd/mdb/sparc/v9/libpython/Makefile b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
index 79f47dd624..cd237fd5c1 100644
--- a/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
@@ -25,7 +25,7 @@
 
 include $(SRC)/Makefile.master
 
-MODULE = libpython$(PYTHON_VERSION).so
+MODULE = libpython$(PYTHON3_VERSION).so
 MDBTGT = proc
 MODULE_NAME = libpython
 
diff --git a/usr/src/lib/brand/solaris10/cmd/Makefile b/usr/src/lib/brand/solaris10/cmd/Makefile
index 3ef9e0412f..41c0a6e52b 100644
--- a/usr/src/lib/brand/solaris10/cmd/Makefile
+++ b/usr/src/lib/brand/solaris10/cmd/Makefile
@@ -22,7 +22,7 @@
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-PROGS =		s10_native s10_isaexec_wrapper s10_python_wrapper \
+PROGS =		s10_native s10_isaexec_wrapper \
 		s10_net_physical
 
 include $(SRC)/cmd/Makefile.cmd
@@ -31,16 +31,11 @@ include ../Makefile.s10
 # override the install directory
 ROOTBIN =	$(ROOTBRANDDIR)
 CLOBBERFILES =	$(ROOTPROGS)
-CLEANFILES +=	s10_python_wrapper.sh
-
-s10_python_wrapper.sh:	s10_python_wrapper.sh.in
-	$(SED) -e "s:@PYTHON_VERSION@:$(PYTHON_VERSION):g" < s10_python_wrapper.sh.in > $@
 
 .KEEP_STATE:
 
 all: $(PROGS)
 
-
 install: all $(ROOTPROGS)
 
 clean:
diff --git a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in b/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
deleted file mode 100644
index ecb7c27155..0000000000
--- a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-#
-# This script is invoked by python-governed executable wrappers from within
-# s10-branded zones.  It uses the native python and native linker.
-# The only consumer is currently the zfs command which uses python for
-# a few of its subcommands.
-#
-# All native executables must be run using the native linker.
-# By default, the kernel loads the linker at /lib/ld.so.1, which
-# in an s10 zone is the s10 linker.  Hence when we run the native
-# executable below, we explicitly specify /.SUNWnative/lib/ld.so.1 as our 32-
-# bit linker and /.SUNWnative/lib/64/ld.so.1 as our 64-bit linker.
-# For convience we define "n" to be the native path prefix.
-#
-pyname=$0
-n=/.SUNWnative
-
-PYTHONPATH=/.SUNWnative/usr/lib/python@PYTHON_VERSION@/vendor-packages
-export PYTHONPATH
-
-# This wrapper is running in the S10 zone so there is no L10N for the
-# following error msg.
-if [ ! -f $n$pyname ]; then
-	echo "Error: \"$pyname\" is not installed in the global zone"
-	exit 1
-fi
-
-exec $n/usr/lib/brand/solaris10/s10_native \
-    $n/lib/ld.so.1 \
-    -e LD_NOENVIRON=1 \
-    -e LD_NOCONFIG=1 \
-    -e LD_PRELOAD_32=s10_npreload.so.1 \
-    -e LD_PRELOAD_64=s10_npreload.so.1 \
-    -e LD_LIBRARY_PATH_32="$n/lib:$n/usr/lib:$n/usr/lib/mps" \
-    -e LD_LIBRARY_PATH_64="$n/lib/64:$n/usr/lib/64:$n/usr/lib/mps/64" \
-    $n/usr/bin/python@PYTHON_VERSION@ $n$pyname "$@"
diff --git a/usr/src/lib/pylibbe/Makefile b/usr/src/lib/pylibbe/Makefile
index f5ac51de2a..4018053ac8 100644
--- a/usr/src/lib/pylibbe/Makefile
+++ b/usr/src/lib/pylibbe/Makefile
@@ -27,11 +27,8 @@
 
 include	../Makefile.lib
 
-SUBDIRS=
-$(BUILDPY2)SUBDIRS += $(MACH)
-$(BUILD64)$(BUILDPY2)SUBDIRS += $(MACH64)
-$(BUILD64)$(BUILDPY3)SUBDIRS += py3
-$(BUILD64)$(BUILDPY3b)SUBDIRS += py3b
+SUBDIRS= py3
+$(BUILDPY3b)SUBDIRS += py3b
 XGETTEXT=	$(GNUXGETTEXT)
 XGETFLAGS=	$(GNUXGETFLAGS)
 
diff --git a/usr/src/lib/pylibbe/amd64/Makefile b/usr/src/lib/pylibbe/amd64/Makefile
deleted file mode 100644
index 9209b53492..0000000000
--- a/usr/src/lib/pylibbe/amd64/Makefile
+++ /dev/null
@@ -1,33 +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 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/pylibbe/i386/Makefile b/usr/src/lib/pylibbe/i386/Makefile
deleted file mode 100644
index decc45d4f6..0000000000
--- a/usr/src/lib/pylibbe/i386/Makefile
+++ /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 (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS)
diff --git a/usr/src/lib/pylibbe/sparc/Makefile b/usr/src/lib/pylibbe/sparc/Makefile
deleted file mode 100644
index 5a771c0816..0000000000
--- a/usr/src/lib/pylibbe/sparc/Makefile
+++ /dev/null
@@ -1,28 +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.
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS)
diff --git a/usr/src/lib/pylibbe/sparcv9/Makefile b/usr/src/lib/pylibbe/sparcv9/Makefile
deleted file mode 100644
index 32e9e54ca4..0000000000
--- a/usr/src/lib/pylibbe/sparcv9/Makefile
+++ /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 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-#
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/pysolaris/Makefile b/usr/src/lib/pysolaris/Makefile
index f564e4782f..1e500d8dd2 100644
--- a/usr/src/lib/pysolaris/Makefile
+++ b/usr/src/lib/pysolaris/Makefile
@@ -26,11 +26,8 @@
 
 include	../Makefile.lib
 
-SUBDIRS=
-$(BUILDPY2)SUBDIRS += $(MACH)
-$(BUILD64)$(BUILDPY2)SUBDIRS += $(MACH64)
-$(BUILD64)$(BUILDPY3)SUBDIRS += py3
-$(BUILD64)$(BUILDPY3b)SUBDIRS += py3b
+SUBDIRS= py3
+$(BUILDPY3b)SUBDIRS += py3b
 
 all :=		TARGET= all
 install :=	TARGET= install
diff --git a/usr/src/lib/pysolaris/amd64/Makefile b/usr/src/lib/pysolaris/amd64/Makefile
deleted file mode 100644
index 91c7fbd58b..0000000000
--- a/usr/src/lib/pysolaris/amd64/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# CDDL HEADER START
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-# CDDL HEADER END
-
-#
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-all: $(LIBS)
-install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/pysolaris/i386/Makefile b/usr/src/lib/pysolaris/i386/Makefile
deleted file mode 100644
index c34c0504de..0000000000
--- a/usr/src/lib/pysolaris/i386/Makefile
+++ /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.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-
-all: $(PYOBJS) $(LIBS)
-install: all $(ROOTPYSOLFILES) $(ROOTLIBS)
diff --git a/usr/src/lib/pysolaris/py3/Makefile b/usr/src/lib/pysolaris/py3/Makefile
index 12abf943c4..302ae473b3 100644
--- a/usr/src/lib/pysolaris/py3/Makefile
+++ b/usr/src/lib/pysolaris/py3/Makefile
@@ -16,9 +16,8 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-PYSHEBANG = $(PYTHON3)
 PYVER = $(PYTHON3_VERSION)
-PYSUFFIX = $(PYTHON3_SUFFIX)
+PYSUFFIX= $(PYTHON3_SUFFIX)
 
 LDLIBS64 += -L$(ADJUNCT_PROTO)/usr/lib/$(MACH64)
 MAPFILES= $(SRCDIR)/mapfile-py3
diff --git a/usr/src/lib/pysolaris/sparc/Makefile b/usr/src/lib/pysolaris/sparc/Makefile
deleted file mode 100644
index cf68e8eb6d..0000000000
--- a/usr/src/lib/pysolaris/sparc/Makefile
+++ /dev/null
@@ -1,27 +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.
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS)
diff --git a/usr/src/lib/pysolaris/sparcv9/Makefile b/usr/src/lib/pysolaris/sparcv9/Makefile
deleted file mode 100644
index 91c7fbd58b..0000000000
--- a/usr/src/lib/pysolaris/sparcv9/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# CDDL HEADER START
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-# CDDL HEADER END
-
-#
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-all: $(LIBS)
-install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/pyzfs/Makefile b/usr/src/lib/pyzfs/Makefile
index ac33e6d336..5d0ae5c8b2 100644
--- a/usr/src/lib/pyzfs/Makefile
+++ b/usr/src/lib/pyzfs/Makefile
@@ -26,11 +26,8 @@
 
 include	../Makefile.lib
 
-SUBDIRS=
-$(BUILDPY2)SUBDIRS += $(MACH)
-$(BUILD64)$(BUILDPY2)SUBDIRS += $(MACH64)
-$(BUILD64)$(BUILDPY3)SUBDIRS += py3
-$(BUILD64)$(BUILDPY3b)SUBDIRS += py3b
+SUBDIRS= py3
+$(BUILDPY3b)SUBDIRS += py3b
 
 XGETTEXT=	$(GNUXGETTEXT)
 XGETFLAGS=	$(GNUXGETFLAGS)
diff --git a/usr/src/lib/pyzfs/amd64/Makefile b/usr/src/lib/pyzfs/amd64/Makefile
deleted file mode 100644
index 11141ef969..0000000000
--- a/usr/src/lib/pyzfs/amd64/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# CDDL HEADER START
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-# CDDL HEADER END
-
-#
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-all: $(LIBS)
-install: all $(ROOTLIBS64)
diff --git a/usr/src/lib/pyzfs/i386/Makefile b/usr/src/lib/pyzfs/i386/Makefile
deleted file mode 100644
index 3c870131dc..0000000000
--- a/usr/src/lib/pyzfs/i386/Makefile
+++ /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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-
-all: $(PBOJECT) $(LIBS)
-install: all $(ROOTPYZFSFILES) $(ROOTLIBS)
diff --git a/usr/src/lib/pyzfs/sparc/Makefile b/usr/src/lib/pyzfs/sparc/Makefile
deleted file mode 100644
index 4ce880c2ae..0000000000
--- a/usr/src/lib/pyzfs/sparc/Makefile
+++ /dev/null
@@ -1,27 +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 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS)
diff --git a/usr/src/lib/pyzfs/sparcv9/Makefile b/usr/src/lib/pyzfs/sparcv9/Makefile
deleted file mode 100644
index 11141ef969..0000000000
--- a/usr/src/lib/pyzfs/sparcv9/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# CDDL HEADER START
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-# CDDL HEADER END
-
-#
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
-
-PYVER = $(PYTHON_VERSION)
-PYSUFFIX = $(PYTHON_SUFFIX)
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-all: $(LIBS)
-install: all $(ROOTLIBS64)
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index c24fa20b9f..4d55b711af 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -153,9 +153,7 @@ PKGVERS= $(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 # packaging, we need both values.
 #
 i386_ARCH32= i86
-sparc_ARCH32= sparcv7
 i386_ARCH64= amd64
-sparc_ARCH64= sparcv9
 
 #
 # macros and transforms needed by pkgmogrify
@@ -178,7 +176,6 @@ $(JAVA_8_ONLY)JAVA_11_ONLY=$(POUND_SIGN)
 
 PKGMOG_DEFINES= \
 	i386_ONLY=$(POUND_SIGN) \
-	sparc_ONLY=$(POUND_SIGN) \
 	$(PKGMACH)_ONLY= \
 	ARCH=$(PKGMACH) \
 	ARCH32=$($(PKGMACH)_ARCH32) \
@@ -193,17 +190,11 @@ PKGMOG_DEFINES= \
 	PERL_PKGVERS=$(PERL_PKGVERS) \
 	BUILDPERL32=$(BUILDPERL32) \
 	BUILDPERL64=$(BUILDPERL64) \
-	PYTHON_VERSION=$(PYTHON_VERSION) \
 	PYTHON3_VERSION=$(PYTHON3_VERSION) \
 	PYTHON3b_VERSION=$(PYTHON3b_VERSION) \
-	PYTHON_PKGVERS=$(PYTHON_PKGVERS) \
 	PYTHON3_PKGVERS=$(PYTHON3_PKGVERS) \
 	PYTHON3b_PKGVERS=$(PYTHON3b_PKGVERS) \
-	python2_ONLY=$(BUILDPY2) \
-	python3_ONLY=$(BUILDPY3) \
 	python3b_ONLY=$(BUILDPY3b) \
-	python2tools_ONLY=$(BUILDPY2TOOLS) \
-	python3tools_ONLY=$(BUILDPY3TOOLS) \
 	JAVA_11_ONLY=$(JAVA_11_ONLY) \
 	JAVA_8_ONLY=$(JAVA_8_ONLY)
 
@@ -213,11 +204,6 @@ PKGDEP_TOKENS_i386= \
 	'PLATFORM=i86xpv' \
 	'ISALIST=amd64' \
 	'ISALIST=i386'
-PKGDEP_TOKENS_sparc= \
-	'PLATFORM=sun4u' \
-	'PLATFORM=sun4v' \
-	'ISALIST=sparcv9' \
-	'ISALIST=sparc'
 PKGDEP_TOKENS= $(PKGDEP_TOKENS_$(PKGMACH))
 
 #
@@ -251,21 +237,15 @@ CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH) install-$(PKGMACH).out \
 # SPECIAL_MANIFESTS variable. It can contain wildcards in regexp form, i.e.
 # SUNW.* as one useful example.
 #
-SPECIAL_MANIFESTS = system-library-python-.*
+SPECIAL_MANIFESTS = system-library-python-libbe-3b\.p5m \
+    system-library-python-solaris-3b\.p5m \
+    system-library-python-zfs-3b\.p5m
 LIST_MANIFESTS_CMD = (cd manifests ; /usr/bin/ls -1 *.p5m |\
 	$(SED) $(SPECIAL_MANIFESTS:%=-e '/^%$$/d') )
 MANIFESTS = $(LIST_MANIFESTS_CMD:sh)
 
-# Conditionally add back python modules
-$(BUILDPY2) MANIFESTS += \
-	system-library-python-libbe-2.p5m \
-	system-library-python-solaris-2.p5m \
-	system-library-python-zfs-2.p5m
-$(BUILDPY3) MANIFESTS += \
-	system-library-python-libbe-3.p5m \
-	system-library-python-solaris-3.p5m \
-	system-library-python-zfs-3.p5m
-$(BUILDPY3b) MANIFESTS += \
+# Conditionally add back the py3b manifests if requested
+$(BUILDPY3b)MANIFESTS += \
 	system-library-python-libbe-3b.p5m \
 	system-library-python-solaris-3b.p5m \
 	system-library-python-zfs-3b.p5m
@@ -715,8 +695,6 @@ pkglint: makesilent
 	$(PKGDEBUG)$(CP) etc/pkglintrc $(PDIR)/pkglintrc
 	$(PKGDEBUG)$(GREP) pkg:/ $(CODEMGR_WS)/exception_lists/packaging.deps \
 	    | sed 's/.*/    & \\/' >> $(PDIR)/pkglintrc
-	$(PKGDEBUG)echo "    pkg:/runtime/python$(PYTHON_PKGVERS) \\" \
-	     >> $(PDIR)/pkglintrc
 	$(PKGDEBUG)echo "    pkg:/runtime/python$(PYTHON3_PKGVERS) \\" \
 	     >> $(PDIR)/pkglintrc
 	$(PKGDEBUG) echo "    pkg:/runtime/perl$(PERL_PKGVERS) \\" \
@@ -771,9 +749,9 @@ gendeps: $(PDIR)/gendeps
 # Since the most common use case for this is "install," the architecture
 # specific install targets have been further abbreviated to elide "/install."
 #
-i386/% sparc/%:
+i386/%:
 	$(MAKE) -e $(@F) PKGMACH=$(@D) SUPPRESSPKGDEP=$(SUPPRESSPKGDEP)
 
-i386 sparc: $$(@)/install
+i386: $$(@)/install
 
 FRC:
diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg
index 3822dc9c66..e1c2183188 100644
--- a/usr/src/pkg/README.pkg
+++ b/usr/src/pkg/README.pkg
@@ -136,7 +136,7 @@ Incremental Builds
    packages will simply be added to the existing repository.
 
    To do cross-platform packaging, prefix your target with (for
-   example) "sparc/", as in "dmake sparc/install".  Note that we
+   example) "i386/", as in "dmake i386/install".  Note that we
    currently pull some license files directly from a built source
    tree, so if you do this in a workspace that had proto area copied
    in via nightly -U, then you'll need to set $SRC to point to the
@@ -213,7 +213,6 @@ We supply a set of commonly-used macros for use in package manifests.
 These are the PKGMOG_DEFINES in usr/src/pkg/Makefile.
 
 	$(i386_ONLY)
-	$(sparc_ONLY)
 	$(ARCH)
 	$(ARCH32)
 	$(ARCH64)
diff --git a/usr/src/pkg/manifests/SUNWbcp.p5m b/usr/src/pkg/manifests/SUNWbcp.p5m
deleted file mode 100644
index 1f4864e93f..0000000000
--- a/usr/src/pkg/manifests/SUNWbcp.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWbcp@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWcg6.p5m b/usr/src/pkg/manifests/SUNWcg6.p5m
deleted file mode 100644
index 24f883a3b5..0000000000
--- a/usr/src/pkg/manifests/SUNWcg6.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWcg6@0.5.11,5.11-0.130
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWcg6h.p5m b/usr/src/pkg/manifests/SUNWcg6h.p5m
deleted file mode 100644
index 0eace2fc93..0000000000
--- a/usr/src/pkg/manifests/SUNWcg6h.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWcg6h@0.5.11,5.11-0.130
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWcs.p5m b/usr/src/pkg/manifests/SUNWcs.p5m
index 70a794b487..b9b55d0d89 100644
--- a/usr/src/pkg/manifests/SUNWcs.p5m
+++ b/usr/src/pkg/manifests/SUNWcs.p5m
@@ -260,16 +260,7 @@ file path=etc/svc/profile/ns_files.xml group=sys mode=0444
 file path=etc/svc/profile/ns_ldap.xml group=sys mode=0444
 file path=etc/svc/profile/ns_nis.xml group=sys mode=0444
 file path=etc/svc/profile/ns_none.xml group=sys mode=0444
-$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,SPARC-Enterprise.xml \
-    group=sys mode=0444
-$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-880.xml \
-    group=sys mode=0444
-$(sparc_ONLY)hardlink path=etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml \
-    target=./platform_SUNW,Sun-Fire-880.xml
-$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire.xml group=sys \
-    mode=0444
 file path=etc/svc/profile/platform_none.xml group=sys mode=0444
-$(sparc_ONLY)file path=etc/svc/profile/platform_sun4v.xml group=sys mode=0444
 dir  path=etc/svc/profile/site group=sys
 dir  path=etc/svc/volatile group=sys
 link path=etc/swap target=../usr/sbin/swap
@@ -370,7 +361,6 @@ dir  path=lib/svc/manifest/network/shares group=sys
 file path=lib/svc/manifest/network/shares/group.xml group=sys mode=0444
 file path=lib/svc/manifest/network/shares/reparsed.xml group=sys mode=0444
 dir  path=lib/svc/manifest/platform group=sys
-$(sparc_ONLY)dir path=lib/svc/manifest/platform/sun4u group=sys
 dir  path=lib/svc/manifest/site group=sys
 dir  path=lib/svc/manifest/system group=sys
 file path=lib/svc/manifest/system/auditd.xml group=sys mode=0444
@@ -1181,7 +1171,6 @@ hardlink path=usr/lib/inet/in.iked target=../../../usr/lib/isaexec
 file path=usr/lib/inet/inetd mode=0555
 file path=usr/lib/intrd mode=0555
 file path=usr/lib/isaexec mode=0555
-$(sparc_ONLY)file path=usr/lib/ld.so
 link path=usr/lib/ld.so.1 target=../../lib/ld.so.1
 file path=usr/lib/libshare.so.1
 dir  path=usr/lib/locale
@@ -1438,7 +1427,6 @@ hardlink path=usr/sbin/poweroff target=./halt
 file path=usr/sbin/praudit mode=0555
 file path=usr/sbin/prtconf group=sys mode=2555
 $(i386_ONLY)file path=usr/sbin/prtdiag group=sys mode=2755
-$(sparc_ONLY)hardlink path=usr/sbin/prtdiag target=../../usr/lib/platexec
 file path=usr/sbin/prtvtoc group=sys mode=0555
 file path=usr/sbin/psradm group=sys mode=0555
 file path=usr/sbin/psrinfo group=sys mode=0555
@@ -1508,7 +1496,6 @@ file path=usr/sbin/update_drv group=sys mode=0555
 file path=usr/sbin/useradd group=sys mode=0555
 file path=usr/sbin/userdel group=sys mode=0555
 file path=usr/sbin/usermod group=sys mode=0555
-$(sparc_ONLY)file path=usr/sbin/virtinfo mode=0555
 file path=usr/sbin/volcopy mode=0555
 file path=usr/sbin/wall group=tty mode=2555
 file path=usr/sbin/whodo mode=4555
@@ -1610,8 +1597,6 @@ dir  path=var/svc/manifest/network/rpc group=sys
 dir  path=var/svc/manifest/network/security group=sys
 dir  path=var/svc/manifest/network/shares group=sys
 dir  path=var/svc/manifest/platform group=sys
-$(sparc_ONLY)dir path=var/svc/manifest/platform/sun4u group=sys
-$(sparc_ONLY)dir path=var/svc/manifest/platform/sun4v group=sys
 dir  path=var/svc/manifest/site group=sys
 dir  path=var/svc/manifest/system group=sys
 dir  path=var/svc/manifest/system/device group=sys
diff --git a/usr/src/pkg/manifests/SUNWcti2.p5m b/usr/src/pkg/manifests/SUNWcti2.p5m
deleted file mode 100644
index 743e4fd714..0000000000
--- a/usr/src/pkg/manifests/SUNWcti2.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWcti2@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWdcs.p5m b/usr/src/pkg/manifests/SUNWdcs.p5m
deleted file mode 100644
index abd9422a46..0000000000
--- a/usr/src/pkg/manifests/SUNWdcs.p5m
+++ /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:/SUNWdcs@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require \
-    fmri=pkg:/system/domain-configuration/sparc-enterprise@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWdrr.p5m b/usr/src/pkg/manifests/SUNWdrr.p5m
deleted file mode 100644
index 3856f1635b..0000000000
--- a/usr/src/pkg/manifests/SUNWdrr.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWdrr@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWdscp.p5m b/usr/src/pkg/manifests/SUNWdscp.p5m
deleted file mode 100644
index e9a1930fc5..0000000000
--- a/usr/src/pkg/manifests/SUNWdscp.p5m
+++ /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:/SUNWdscp@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require \
-    fmri=pkg:/system/domain-service-processor-protocol/sparc-enterprise@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWefc.p5m b/usr/src/pkg/manifests/SUNWefc.p5m
deleted file mode 100644
index 036d4fdfa5..0000000000
--- a/usr/src/pkg/manifests/SUNWefc.p5m
+++ /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:/SUNWefc@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require \
-    fmri=pkg:/system/embedded-fcode-interpreter@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWerid.p5m b/usr/src/pkg/manifests/SUNWerid.p5m
deleted file mode 100644
index 278618c816..0000000000
--- a/usr/src/pkg/manifests/SUNWerid.p5m
+++ /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:/SUNWerid@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/network/eri@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWfs.p5m b/usr/src/pkg/manifests/SUNWfs.p5m
deleted file mode 100644
index 33a42f3137..0000000000
--- a/usr/src/pkg/manifests/SUNWfs.p5m
+++ /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 2015 Gary Mills
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/SUNWfs@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWhmdu.p5m b/usr/src/pkg/manifests/SUNWhmdu.p5m
deleted file mode 100644
index 78583bbdc3..0000000000
--- a/usr/src/pkg/manifests/SUNWhmdu.p5m
+++ /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:/SUNWhmdu@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/storage/fas/header-fas@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWidn.p5m b/usr/src/pkg/manifests/SUNWidn.p5m
deleted file mode 100644
index 107a3597d9..0000000000
--- a/usr/src/pkg/manifests/SUNWidn.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWidn@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWiopc.p5m b/usr/src/pkg/manifests/SUNWiopc.p5m
deleted file mode 100644
index 3aa626f212..0000000000
--- a/usr/src/pkg/manifests/SUNWiopc.p5m
+++ /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:/SUNWiopc@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require \
-    fmri=pkg:/system/kernel/io-performance-counters@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWldom.p5m b/usr/src/pkg/manifests/SUNWldom.p5m
deleted file mode 100644
index 48ee7da0d8..0000000000
--- a/usr/src/pkg/manifests/SUNWldom.p5m
+++ /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:/SUNWldom@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/system/ldoms@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWluxd.p5m b/usr/src/pkg/manifests/SUNWluxd.p5m
deleted file mode 100644
index 3e3da4e4f5..0000000000
--- a/usr/src/pkg/manifests/SUNWluxd.p5m
+++ /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:/SUNWluxd@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/storage/sf@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWluxl.p5m b/usr/src/pkg/manifests/SUNWluxl.p5m
deleted file mode 100644
index 6b32fb72a3..0000000000
--- a/usr/src/pkg/manifests/SUNWluxl.p5m
+++ /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:/SUNWluxl@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/network/socal@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWluxopr.p5m b/usr/src/pkg/manifests/SUNWluxopr.p5m
deleted file mode 100644
index 8d93f409a0..0000000000
--- a/usr/src/pkg/manifests/SUNWluxopr.p5m
+++ /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:/SUNWluxopr@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/storage/library/network-array@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWn2cp.p5m b/usr/src/pkg/manifests/SUNWn2cp.p5m
deleted file mode 100644
index b4e62d9d8e..0000000000
--- a/usr/src/pkg/manifests/SUNWn2cp.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWn2cp@0.5.11,5.11-0.148
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWniumx.p5m b/usr/src/pkg/manifests/SUNWniumx.p5m
deleted file mode 100644
index 57662be832..0000000000
--- a/usr/src/pkg/manifests/SUNWniumx.p5m
+++ /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:/SUNWniumx@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/network/niumx@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWpdu.p5m b/usr/src/pkg/manifests/SUNWpdu.p5m
deleted file mode 100644
index 925c89e2a1..0000000000
--- a/usr/src/pkg/manifests/SUNWpdu.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWpdu@0.5.11,5.11-0.142
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWpstl.p5m b/usr/src/pkg/manifests/SUNWpstl.p5m
deleted file mode 100644
index dd1e01aec3..0000000000
--- a/usr/src/pkg/manifests/SUNWpstl.p5m
+++ /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:/SUNWpstl@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/developer/apptrace/platform@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWqfed.p5m b/usr/src/pkg/manifests/SUNWqfed.p5m
deleted file mode 100644
index 700f4d4ca7..0000000000
--- a/usr/src/pkg/manifests/SUNWqfed.p5m
+++ /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:/SUNWqfed@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/network/qfe@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWsckm.p5m b/usr/src/pkg/manifests/SUNWsckm.p5m
deleted file mode 100644
index 1a0671814a..0000000000
--- a/usr/src/pkg/manifests/SUNWsckm.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWsckm@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWsfdr.p5m b/usr/src/pkg/manifests/SUNWsfdr.p5m
deleted file mode 100644
index 7824896b07..0000000000
--- a/usr/src/pkg/manifests/SUNWsfdr.p5m
+++ /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:/SUNWsfdr@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require \
-    fmri=pkg:/system/kernel/dynamic-reconfiguration/sun-fire-880@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWssad.p5m b/usr/src/pkg/manifests/SUNWssad.p5m
deleted file mode 100644
index e10f3dcb93..0000000000
--- a/usr/src/pkg/manifests/SUNWssad.p5m
+++ /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:/SUNWssad@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/storage/ssd@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWstc.p5m b/usr/src/pkg/manifests/SUNWstc.p5m
deleted file mode 100644
index 276f058384..0000000000
--- a/usr/src/pkg/manifests/SUNWstc.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWstc@0.5.11,5.11-0.133
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/SUNWus.p5m b/usr/src/pkg/manifests/SUNWus.p5m
deleted file mode 100644
index 8dc9f8ef16..0000000000
--- a/usr/src/pkg/manifests/SUNWus.p5m
+++ /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:/SUNWus@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/driver/cpu/us@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWust.p5m b/usr/src/pkg/manifests/SUNWust.p5m
deleted file mode 100644
index d27ba36e5c..0000000000
--- a/usr/src/pkg/manifests/SUNWust.p5m
+++ /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:/SUNWust@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
-set name=variant.arch value=sparc
-depend type=require fmri=pkg:/system/kernel/cpu/sun4v@0.5.11,5.11-0.133
diff --git a/usr/src/pkg/manifests/SUNWwbsd.p5m b/usr/src/pkg/manifests/SUNWwbsd.p5m
deleted file mode 100644
index bf1b59b389..0000000000
--- a/usr/src/pkg/manifests/SUNWwbsd.p5m
+++ /dev/null
@@ -1,28 +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:/SUNWwbsd@0.5.11,5.11-0.130
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/developer-apptrace-platform.p5m b/usr/src/pkg/manifests/developer-apptrace-platform.p5m
deleted file mode 100644
index 77bc4b3b1f..0000000000
--- a/usr/src/pkg/manifests/developer-apptrace-platform.p5m
+++ /dev/null
@@ -1,85 +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.
-# Copyright 2019 Peter Tribble.
-#
-
-set name=pkg.fmri value=pkg:/developer/apptrace/platform@$(PKGVERS)
-set name=pkg.summary value="Platform specific apptrace support"
-set name=pkg.description value="Apptrace processor specific shared objects"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/System
-set name=variant.arch value=sparc
-dir  path=usr group=sys
-dir  path=usr/platform group=sys
-dir  path=usr/platform/SUNW,A70 group=sys
-dir  path=usr/platform/SUNW,A70/lib
-dir  path=usr/platform/SUNW,Netra-CP3010 group=sys
-dir  path=usr/platform/SUNW,Netra-CP3010/lib
-dir  path=usr/platform/SUNW,Netra-T12 group=sys
-dir  path=usr/platform/SUNW,Netra-T12/lib
-dir  path=usr/platform/SUNW,Netra-T4 group=sys
-dir  path=usr/platform/SUNW,Netra-T4/lib
-dir  path=usr/platform/SUNW,Sun-Blade-100 group=sys
-dir  path=usr/platform/SUNW,Sun-Blade-100/lib
-dir  path=usr/platform/SUNW,Sun-Blade-1000 group=sys
-dir  path=usr/platform/SUNW,Sun-Blade-1000/lib
-dir  path=usr/platform/SUNW,Sun-Blade-1500 group=sys
-dir  path=usr/platform/SUNW,Sun-Blade-1500/lib
-dir  path=usr/platform/SUNW,Sun-Blade-2500 group=sys
-dir  path=usr/platform/SUNW,Sun-Blade-2500/lib
-dir  path=usr/platform/SUNW,Sun-Fire group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-280R group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-280R/lib
-dir  path=usr/platform/SUNW,Sun-Fire-480R group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-480R/lib
-dir  path=usr/platform/SUNW,Sun-Fire-880 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-880/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V215 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V215/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V240 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V240/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V250 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V250/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V440 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V440/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V445 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V445/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V490 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V490/lib
-dir  path=usr/platform/SUNW,Sun-Fire-V890 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V890/lib
-dir  path=usr/platform/SUNW,Sun-Fire/lib
-dir  path=usr/platform/SUNW,Ultra-2 group=sys
-dir  path=usr/platform/SUNW,Ultra-2/lib
-dir  path=usr/platform/SUNW,Ultra-250 group=sys
-dir  path=usr/platform/SUNW,Ultra-250/lib
-dir  path=usr/platform/SUNW,Ultra-4 group=sys
-dir  path=usr/platform/SUNW,Ultra-4/lib
-dir  path=usr/platform/SUNW,Ultra-Enterprise group=sys
-dir  path=usr/platform/SUNW,Ultra-Enterprise/lib
-legacy pkg=SUNWpstl.u arch=$(ARCH).sun4u \
-    desc="Apptrace processor specific shared objects" \
-    name="Platform specific apptrace support"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/developer-build-onbld.p5m b/usr/src/pkg/manifests/developer-build-onbld.p5m
index ca55e019f7..c9e5ad7fa4 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.p5m
+++ b/usr/src/pkg/manifests/developer-build-onbld.p5m
@@ -48,7 +48,6 @@ dir  path=opt/onbld/bin
 dir  path=opt/onbld/bin/$(ARCH)
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/aw mode=0555
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/btxld mode=0555
-$(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/chk4ubin mode=0555
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/cpcgen mode=0555
 file path=opt/onbld/bin/$(ARCH)/cscope-fast mode=0555
 file path=opt/onbld/bin/$(ARCH)/ctfconvert mode=0555
@@ -62,8 +61,6 @@ link path=opt/onbld/bin/$(ARCH)/dmake target=make
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/elfextract mode=0555
 file path=opt/onbld/bin/$(ARCH)/find_elf mode=0555
 file path=opt/onbld/bin/$(ARCH)/findunref mode=0555
-$(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/forth mode=0555
-$(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/forth_preload.so.1 mode=0555
 file path=opt/onbld/bin/$(ARCH)/install mode=0555
 hardlink path=opt/onbld/bin/$(ARCH)/install.bin target=./install
 file path=opt/onbld/bin/$(ARCH)/lintdump mode=0555
@@ -74,10 +71,7 @@ file path=opt/onbld/bin/$(ARCH)/ndrgen mode=0555
 file path=opt/onbld/bin/$(ARCH)/ndrgen1 mode=0555
 file path=opt/onbld/bin/$(ARCH)/protocmp mode=0555
 file path=opt/onbld/bin/$(ARCH)/protolist mode=0555
-$(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/stabs mode=0555
 file path=opt/onbld/bin/$(ARCH)/tic 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/$(ARCH)/zic mode=0555
 file path=opt/onbld/bin/Install mode=0555
 file path=opt/onbld/bin/bldenv mode=0555
@@ -144,242 +138,109 @@ file path=opt/onbld/lib/$(ARCH)/libmakestate.so.1
 dir  path=opt/onbld/lib/perl
 file path=opt/onbld/lib/perl/onbld_elfmod.pm
 file path=opt/onbld/lib/perl/onbld_elfmod_vertype.pm
-$(python2tools_ONLY)link path=opt/onbld/lib/python \
-    target=python$(PYTHON_VERSION)
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/CStyle.py \
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/CStyle.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Cddl.py mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/CmtBlk.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Cddl.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/CmtBlk.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Comments.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Comments.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Copyright.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Copyright.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/DbLookups.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/DbLookups.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/HdrChk.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/HdrChk.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/JStyle.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/JStyle.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Keywords.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Keywords.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/ManLint.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/ManLint.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Mapfile.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/Mapfile.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/PkgFmt.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/PkgFmt.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/ProcessCheck.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/ProcessCheck.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/ShellLint.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/ShellLint.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/SpellCheck.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/SpellCheck.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/WsCheck.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/WsCheck.py \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__init__.py \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__init__.py \
     mode=0444
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__
-$(python3tools_ONLY)file \
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/CStyle.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/Cddl.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/CmtBlk.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/Comments.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/Copyright.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/DbLookups.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/HdrChk.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/JStyle.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/Keywords.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/ManLint.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/Mapfile.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/PkgFmt.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/ProcessCheck.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/ShellLint.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/SpellCheck.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/WsCheck.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/Ignore.py mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/__init__.py mode=0444
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/__pycache__
-$(python3tools_ONLY)file \
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/Ignore.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/__init__.py mode=0444
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/__pycache__
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/__pycache__/Ignore.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/Scm/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python3tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/__init__.py mode=0444
-$(python3tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/__pycache__
-$(python3tools_ONLY)file \
+file path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/__init__.py mode=0444
+dir  path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/__pycache__
+file \
     path=opt/onbld/lib/python$(PYTHON3_VERSION)/onbld/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc \
     mode=0444
-$(python2tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON_VERSION)
-$(python2tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld
-$(python2tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CStyle.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CStyle.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Cddl.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Cddl.pyc mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CmtBlk.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CmtBlk.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Comments.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Comments.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Copyright.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Copyright.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/DbLookups.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/DbLookups.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/HdrChk.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/HdrChk.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/JStyle.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/JStyle.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Keywords.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Keywords.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ManLint.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ManLint.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Mapfile.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Mapfile.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/PkgFmt.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/PkgFmt.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ProcessCheck.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ProcessCheck.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ShellLint.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ShellLint.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/SpellCheck.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/SpellCheck.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/WsCheck.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/WsCheck.pyc \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/__init__.py \
-    mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/__init__.pyc \
-    mode=0444
-$(python2tools_ONLY)dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Ignore.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Ignore.pyc mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/__init__.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/__init__.pyc mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/__init__.py mode=0444
-$(python2tools_ONLY)file \
-    path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/__init__.pyc mode=0444
 dir  path=opt/onbld/man
 dir  path=opt/onbld/man/man1onbld
 file path=opt/onbld/man/man1onbld/Install.1onbld
diff --git a/usr/src/pkg/manifests/developer-debug-mdb.p5m b/usr/src/pkg/manifests/developer-debug-mdb.p5m
index 5b58449cda..5614b7c27f 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb.p5m
+++ b/usr/src/pkg/manifests/developer-debug-mdb.p5m
@@ -43,7 +43,6 @@ file path=kernel/kmdb/$(ARCH64)/crypto group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/genunix group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/hook group=sys mode=0555
 $(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/i40e group=sys mode=0555
-$(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/intr group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/ip group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/ipc group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/ipp group=sys mode=0555
@@ -58,11 +57,7 @@ file path=kernel/kmdb/$(ARCH64)/mpt_sas group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/mr_sas group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/neti group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/nfs group=sys mode=0555
-$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/niumx target=intr
-$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcipsy target=intr
-$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcisch target=intr
 file path=kernel/kmdb/$(ARCH64)/ptm group=sys mode=0555
-$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/px target=intr
 file path=kernel/kmdb/$(ARCH64)/random group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/s1394 group=sys mode=0555
 $(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/sata group=sys mode=0555
@@ -72,7 +67,6 @@ file path=kernel/kmdb/$(ARCH64)/sd group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/sockfs group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/specfs group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/sppp group=sys mode=0555
-$(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/ssd group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/ufs group=sys mode=0555
 $(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/uhci group=sys mode=0555
 file path=kernel/kmdb/$(ARCH64)/usba group=sys mode=0555
@@ -101,34 +95,6 @@ $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_psm group=sys \
     mode=0555
 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_uppc group=sys \
     mode=0555
-$(sparc_ONLY)dir path=platform/sun4u group=sys variant.opensolaris.zone=global
-$(sparc_ONLY)dir path=platform/sun4u/kernel group=sys \
-    variant.opensolaris.zone=global
-$(sparc_ONLY)dir path=platform/sun4u/kernel/kmdb group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/kmdb/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/oplhwd group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/sgenv group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/sgsbbc group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/unix group=sys \
-    mode=0555
-$(sparc_ONLY)dir path=platform/sun4v group=sys variant.opensolaris.zone=global
-$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys \
-    variant.opensolaris.zone=global
-$(sparc_ONLY)dir path=platform/sun4v/kernel/kmdb group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/kmdb/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/errh group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/ldc group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/mdesc group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/unix group=sys \
-    mode=0555
-$(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/vdsk group=sys \
-    mode=0555
 dir  path=usr group=sys
 dir  path=usr/bin
 dir  path=usr/bin/$(ARCH32)
@@ -156,7 +122,6 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/crypto.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/genunix.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/hook.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/i40e.so group=sys mode=0555
-$(sparc_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/intr.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/ip.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/ipc.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/ipp.so group=sys mode=0555
@@ -172,11 +137,7 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/mpt_sas.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/mr_sas.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/neti.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/nfs.so group=sys mode=0555
-$(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/niumx.so target=intr.so
-$(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/pcipsy.so target=intr.so
-$(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/pcisch.so target=intr.so
 file path=usr/lib/mdb/kvm/$(ARCH64)/ptm.so group=sys mode=0555
-$(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/px.so target=intr.so
 file path=usr/lib/mdb/kvm/$(ARCH64)/random.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/s1394.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/sata.so group=sys mode=0555
@@ -187,19 +148,17 @@ $(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/smbios.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/sockfs.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/specfs.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/sppp.so group=sys mode=0555
-$(sparc_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/ssd.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/ufs.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/uhci.so group=sys mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/usba.so group=sys mode=0555
 dir  path=usr/lib/mdb/proc group=sys
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 $(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64)
 file path=usr/lib/mdb/proc/$(ARCH64)/ld.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libavl.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libc.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libnvpair.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libproc.so group=sys mode=0555
-file path=usr/lib/mdb/proc/$(ARCH64)/libpython$(PYTHON_VERSION).so group=sys \
+file path=usr/lib/mdb/proc/$(ARCH64)/libpython$(PYTHON3_VERSION).so group=sys \
     mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/proc/$(ARCH64)/libsmbios.so group=sys \
     mode=0555
@@ -215,7 +174,6 @@ file path=usr/lib/mdb/proc/libavl.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libc.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libnvpair.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libproc.so group=sys mode=0555
-file path=usr/lib/mdb/proc/libpython$(PYTHON_VERSION).so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/proc/libsmbios.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libsysevent.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libtopo.so group=sys mode=0555
@@ -257,34 +215,6 @@ $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv_psm.so \
     group=sys mode=0555
 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv_uppc.so \
     group=sys mode=0555
-$(sparc_ONLY)dir path=usr/platform/sun4u group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/mdb group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/mdb/kvm group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64) group=sys
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/oplhwd.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/sgenv.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/sgsbbc.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/unix.so \
-    group=sys mode=0555
-$(sparc_ONLY)dir path=usr/platform/sun4v group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/mdb group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/mdb/kvm group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64) group=sys
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/errh.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/ldc.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/mdesc.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/unix.so \
-    group=sys mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/vdsk.so \
-    group=sys mode=0555
 dir  path=usr/share/man
 dir  path=usr/share/man/man1
 file path=usr/share/man/man1/adb.1
diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m b/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
index b9ef682e99..41f1dce68e 100644
--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.p5m
@@ -45,10 +45,6 @@ dir  path=usr/include/sys
 dir  path=usr/kernel group=sys
 dir  path=usr/kernel/pcbe group=sys
 dir  path=usr/kernel/pcbe/$(ARCH64) group=sys
-$(sparc_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.23 target=pcbe.62
-$(sparc_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.4.6 group=sys mode=0755
-$(sparc_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.4.7 target=pcbe.4.6
-$(sparc_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.62 group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.AuthenticAMD group=sys \
     mode=0755
 $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.15 group=sys \
@@ -278,5 +274,3 @@ $(i386_ONLY)license usr/src/data/perfmon/THIRDPARTYLICENSE \
     license=usr/src/data/perfmon/THIRDPARTYLICENSE
 $(i386_ONLY)license usr/src/uts/intel/pcbe/THIRDPARTYLICENSE \
     license=usr/src/uts/intel/pcbe/THIRDPARTYLICENSE
-$(sparc_ONLY)license usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE \
-    license=usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/driver-audio.p5m b/usr/src/pkg/manifests/driver-audio.p5m
index 3e11fe7493..aad93e0912 100644
--- a/usr/src/pkg/manifests/driver-audio.p5m
+++ b/usr/src/pkg/manifests/driver-audio.p5m
@@ -39,7 +39,6 @@ dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
 file path=kernel/drv/$(ARCH64)/audio group=sys
 file path=kernel/drv/$(ARCH64)/audio1575 group=sys
-$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/audiocs group=sys
 file path=kernel/drv/$(ARCH64)/audioens group=sys
 file path=kernel/drv/$(ARCH64)/audiopci group=sys
 file path=kernel/drv/$(ARCH64)/audiots group=sys
@@ -51,7 +50,6 @@ dir  path=usr/share/man
 dir  path=usr/share/man/man4d
 file path=usr/share/man/man4d/audio.4d
 file path=usr/share/man/man4d/audio1575.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/audiocs.4d
 file path=usr/share/man/man4d/audioens.4d
 file path=usr/share/man/man4d/audiopci.4d
 file path=usr/share/man/man4d/audiots.4d
@@ -61,7 +59,6 @@ file path=usr/share/man/man4i/dsp.4i
 file path=usr/share/man/man4i/mixer.4i
 driver name=audio perms="* 0666 root sys"
 driver name=audio1575 alias=pci10b9,5455
-$(sparc_ONLY)driver name=audiocs alias=SUNW,CS4231
 driver name=audioens \
     alias=pci1274,1371 \
     alias=pci1274,5880
diff --git a/usr/src/pkg/manifests/driver-cpu-us.p5m b/usr/src/pkg/manifests/driver-cpu-us.p5m
deleted file mode 100644
index 0bac6d0bdd..0000000000
--- a/usr/src/pkg/manifests/driver-cpu-us.p5m
+++ /dev/null
@@ -1,53 +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/cpu/us@$(PKGVERS)
-set name=pkg.summary value="UltraSPARC CPU Device Driver"
-set name=pkg.description value="UltraSPARC CPU Device Driver"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=variant.arch value=sparc
-dir  path=platform group=sys
-dir  path=platform/sun4u group=sys
-dir  path=platform/sun4u/kernel group=sys
-dir  path=platform/sun4u/kernel/drv group=sys
-dir  path=platform/sun4u/kernel/drv/$(ARCH64) group=sys
-file path=platform/sun4u/kernel/drv/$(ARCH64)/us group=sys
-driver name=us \
-    alias=SUNW,UltraSPARC-III \
-    alias=SUNW,UltraSPARC-III+ \
-    alias=SUNW,UltraSPARC-IIIi \
-    alias=SUNW,UltraSPARC-IIIi+ \
-    alias=SUNW,UltraSPARC-IIe
-legacy pkg=SUNWus.u arch=$(ARCH).sun4u desc="UltraSPARC CPU Device Driver" \
-    name="UltraSPARC CPU Device Driver"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-license license_in_headers license=license_in_headers
diff --git a/usr/src/pkg/manifests/driver-crypto-n2cp.p5m b/usr/src/pkg/manifests/driver-crypto-n2cp.p5m
deleted file mode 100644
index 9262345791..0000000000
--- a/usr/src/pkg/manifests/driver-crypto-n2cp.p5m
+++ /dev/null
@@ -1,28 +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/crypto/n2cp@0.5.11,5.11-0.148
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/driver-crypto-tpm.p5m b/usr/src/pkg/manifests/driver-crypto-tpm.p5m
index 3b0a6e685d..92ef08d469 100644
--- a/usr/src/pkg/manifests/driver-crypto-tpm.p5m
+++ b/usr/src/pkg/manifests/driver-crypto-tpm.p5m
@@ -39,14 +39,6 @@ $(i386_ONLY)dir path=kernel group=sys
 $(i386_ONLY)dir path=kernel/drv group=sys
 $(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/tpm group=sys
-$(sparc_ONLY)dir path=platform 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
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/tpm group=sys
-$(sparc_ONLY)driver name=tpm perms="* 0600 root sys" \
-    devlink=type=ddi_pseudo;name=tpm\t\D alias=SUNW,sun4v-ptpm
 $(i386_ONLY)driver name=tpm perms="* 0600 root sys" \
     devlink=type=ddi_pseudo;name=tpm\t\D
 legacy pkg=SUNWtpm desc="Trusted Platform Module driver" \
diff --git a/usr/src/pkg/manifests/driver-network-bge.p5m b/usr/src/pkg/manifests/driver-network-bge.p5m
index 2d0546f755..2fd04297a9 100644
--- a/usr/src/pkg/manifests/driver-network-bge.p5m
+++ b/usr/src/pkg/manifests/driver-network-bge.p5m
@@ -44,8 +44,7 @@ file path=kernel/drv/bge.conf group=sys
 dir  path=usr/share/man
 dir  path=usr/share/man/man4d
 file path=usr/share/man/man4d/bge.4d
-$(i386_ONLY)driver name=bge perms="* 0666 root sys" \
-    clone_perms="bge 0666 root sys" \
+driver name=bge perms="* 0666 root sys" clone_perms="bge 0666 root sys" \
     alias=SUNW,bge \
     alias=pci108e,1647 \
     alias=pci108e,1648 \
@@ -122,54 +121,6 @@ $(i386_ONLY)driver name=bge perms="* 0666 root sys" \
     alias=pciex14e4,16f3 \
     alias=pciex14e4,16fd \
     alias=pciex14e4,1713
-$(sparc_ONLY)driver name=bge perms="* 0666 root sys" \
-    clone_perms="bge 0666 root sys" \
-    alias=SUNW,bge \
-    alias=pci108e,1647 \
-    alias=pci108e,1648 \
-    alias=pci108e,16a7 \
-    alias=pci108e,16a8 \
-    alias=pci14e4,1645 \
-    alias=pci14e4,1647 \
-    alias=pci14e4,1648 \
-    alias=pci14e4,1649 \
-    alias=pci14e4,1668 \
-    alias=pci14e4,1669 \
-    alias=pci14e4,1677 \
-    alias=pci14e4,1678 \
-    alias=pci14e4,167d \
-    alias=pci14e4,1682 \
-    alias=pci14e4,1686 \
-    alias=pci14e4,16a7 \
-    alias=pci14e4,16a8 \
-    alias=pci14e4,16b0 \
-    alias=pci14e4,16b1 \
-    alias=pci14e4,16b2 \
-    alias=pci14e4,16b3 \
-    alias=pci14e4,16b4 \
-    alias=pci14e4,16b5 \
-    alias=pci14e4,16b6 \
-    alias=pci14e4,16b7 \
-    alias=pci14e4,16c7 \
-    alias=pciex14e4,1655 \
-    alias=pciex14e4,1656 \
-    alias=pciex14e4,1659 \
-    alias=pciex14e4,165a \
-    alias=pciex14e4,165b \
-    alias=pciex14e4,165c \
-    alias=pciex14e4,1677 \
-    alias=pciex14e4,167a \
-    alias=pciex14e4,167b \
-    alias=pciex14e4,0x1682 \
-    alias=pciex14e4,0x1686 \
-    alias=pciex14e4,0x16b0 \
-    alias=pciex14e4,0x16b1 \
-    alias=pciex14e4,0x16b2 \
-    alias=pciex14e4,0x16b3 \
-    alias=pciex14e4,0x16b4 \
-    alias=pciex14e4,0x16b5 \
-    alias=pciex14e4,0x16b6 \
-    alias=pciex14e4,0x16b7
 legacy pkg=SUNWbge \
     desc="Broadcom 57xx Gigabit Ethernet Network Adapter Driver" \
     name="Broadcom 57xx GE NIC Driver"
diff --git a/usr/src/pkg/manifests/driver-network-eri.p5m b/usr/src/pkg/manifests/driver-network-eri.p5m
deleted file mode 100644
index 8f650d9abb..0000000000
--- a/usr/src/pkg/manifests/driver-network-eri.p5m
+++ /dev/null
@@ -1,49 +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/network/eri@$(PKGVERS)
-set name=pkg.summary value="Sun RIO 10/100 Mb Ethernet Drivers"
-set name=pkg.description value="Sun RIO 10/100 Mb Ethernet Drivers"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Networking
-set name=variant.arch value=sparc
-dir  path=kernel group=sys
-dir  path=kernel/drv group=sys
-dir  path=kernel/drv/$(ARCH64) group=sys
-file path=kernel/drv/$(ARCH64)/eri group=sys
-dir  path=usr/share/man
-dir  path=usr/share/man/man4d
-file path=usr/share/man/man4d/eri.4d
-driver name=eri clone_perms="eri 0666 root sys" alias=pci108e,1101
-legacy pkg=SUNWerid desc="Sun RIO 10/100 Mb Ethernet Drivers" \
-    name="Sun RIO 10/100 Mb Ethernet Drivers"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-hme.p5m b/usr/src/pkg/manifests/driver-network-hme.p5m
index af740c395f..3e68afe477 100644
--- a/usr/src/pkg/manifests/driver-network-hme.p5m
+++ b/usr/src/pkg/manifests/driver-network-hme.p5m
@@ -38,15 +38,10 @@ set name=variant.arch value=$(ARCH)
 dir  path=kernel group=sys
 dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/fas group=sys
 file path=kernel/drv/$(ARCH64)/hme group=sys
 dir  path=usr/share/man
 dir  path=usr/share/man/man4d
-$(sparc_ONLY)file path=usr/share/man/man4d/fas.4d
 file path=usr/share/man/man4d/hme.4d
-$(sparc_ONLY)driver name=fas perms="devctl 0600 root sys" class=scsi \
-    alias=SUNW,fas
-$(sparc_ONLY)driver name=hme alias=SUNW,hme
 $(i386_ONLY)driver name=hme alias=pci108e,1001
 legacy pkg=SUNWhmd desc="SunSwift Adapter Drivers" \
     name="SunSwift Adapter Drivers"
diff --git a/usr/src/pkg/manifests/driver-network-hxge.p5m b/usr/src/pkg/manifests/driver-network-hxge.p5m
index 528d8a0596..ee663352a6 100644
--- a/usr/src/pkg/manifests/driver-network-hxge.p5m
+++ b/usr/src/pkg/manifests/driver-network-hxge.p5m
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2022 Garrett D'Amore
 #
 
 #
@@ -44,8 +45,7 @@ file path=kernel/drv/hxge.conf group=sys \
 dir  path=usr/share/man
 dir  path=usr/share/man/man4d
 file path=usr/share/man/man4d/hxge.4d
-$(i386_ONLY)driver name=hxge perms="* 0600 root sys" alias=pci108e,aaaa
-$(sparc_ONLY)driver name=hxge perms="* 0600 root sys" alias=pciex108e,aaaa
+driver name=hxge perms="* 0600 root sys" alias=pci108e,aaaa
 legacy pkg=SUNWhxge desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \
     name="SUN 10Gb hxge NIC Driver"
 license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-niumx.p5m b/usr/src/pkg/manifests/driver-network-niumx.p5m
deleted file mode 100644
index dafb3c79a6..0000000000
--- a/usr/src/pkg/manifests/driver-network-niumx.p5m
+++ /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/network/niumx@$(PKGVERS)
-set name=pkg.summary value="UltraSPARC-T2 NIU nexus driver"
-set name=pkg.description value="UltraSPARC-T2 NIU nexus driver"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=variant.arch value=sparc
-dir  path=platform group=sys
-dir  path=platform/sun4v group=sys
-dir  path=platform/sun4v/kernel group=sys
-dir  path=platform/sun4v/kernel/drv group=sys
-dir  path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/niumx group=sys
-driver name=niumx perms="* 0666 root sys" alias=SUNW,niumx
-legacy pkg=SUNWniumx.v arch=$(ARCH).sun4v \
-    desc="UltraSPARC-T2 NIU nexus driver" name="UltraSPARC-T2 NIU nexus driver"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-nxge.p5m b/usr/src/pkg/manifests/driver-network-nxge.p5m
index f9744ce247..689b2e38d5 100644
--- a/usr/src/pkg/manifests/driver-network-nxge.p5m
+++ b/usr/src/pkg/manifests/driver-network-nxge.p5m
@@ -31,50 +31,23 @@
 <include global_zone_only_component>
 set name=pkg.fmri value=pkg:/driver/network/nxge@$(PKGVERS)
 set name=pkg.summary value="Sun NIU leaf driver"
-$(sparc_ONLY)set name=pkg.description value="Sun NIU 10Gb/1Gb driver"
-$(i386_ONLY)set name=pkg.description value="Sun NIU 10Gb/1Gb leaf driver"
+set name=pkg.description value="Sun NIU 10Gb/1Gb leaf driver"
 set name=info.classification \
     value=org.opensolaris.category.2008:Drivers/Networking
 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
-$(i386_ONLY)file path=kernel/drv/$(ARCH64)/nxge group=sys
-$(i386_ONLY)file path=kernel/drv/nxge.conf group=sys \
+dir  path=kernel group=sys
+dir  path=kernel/drv group=sys
+dir  path=kernel/drv/$(ARCH64) group=sys
+file path=kernel/drv/$(ARCH64)/nxge group=sys
+file path=kernel/drv/nxge.conf group=sys \
     original_name=SUNWnxge:kernel/drv/nxge.conf preserve=renamenew
-$(sparc_ONLY)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)file path=platform/sun4u/kernel/drv/$(ARCH64)/nxge group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/nxge.conf group=sys \
-    original_name=SUNWnxge:platform/sun4u/kernel/drv/nxge.conf \
-    preserve=renamenew
-$(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
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/nxge group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/nxge.conf group=sys \
-    original_name=SUNWnxge:platform/sun4v/kernel/drv/nxge.conf \
-    preserve=renamenew
 dir  path=usr/share/man
 dir  path=usr/share/man/man4d
 file path=usr/share/man/man4d/nxge.4d
-$(sparc_ONLY)driver name=nxge perms="* 0600 root sys" \
+driver name=nxge perms="* 0600 root sys" \
     alias=SUNW,niusl \
-    alias=SUNW,niusl-kt \
-    alias=SUNW,rock-pciex108e,abcd \
     alias=pciex108e,abcd
-$(i386_ONLY)driver name=nxge perms="* 0600 root sys" \
-    alias=SUNW,niusl \
-    alias=pciex108e,abcd
-$(i386_ONLY)legacy pkg=SUNWnxge desc="Sun NIU 10Gb/1Gb leaf driver" \
+legacy pkg=SUNWnxge desc="Sun NIU 10Gb/1Gb leaf driver" \
     name="Sun NIU leaf driver"
-$(sparc_ONLY)legacy pkg=SUNWnxge.u arch=$(ARCH).sun4u \
-    desc="Sun NIU 10Gb/1Gb driver" name="Sun NIU leaf driver"
-$(sparc_ONLY)legacy pkg=SUNWnxge.v arch=$(ARCH).sun4v \
-    desc="Sun NIU leaf driver" name="Sun NIU leaf driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-qfe.p5m b/usr/src/pkg/manifests/driver-network-qfe.p5m
deleted file mode 100644
index 2fd95e1a7a..0000000000
--- a/usr/src/pkg/manifests/driver-network-qfe.p5m
+++ /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.
-#
-
-#
-# 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/network/qfe@$(PKGVERS)
-set name=pkg.summary value="Sun Quad FastEthernet Adapter Driver"
-set name=pkg.description value="Sun Quad FastEtherent PCI/SBus Adapter"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Networking
-set name=variant.arch value=sparc
-dir  path=kernel group=sys
-dir  path=kernel/drv group=sys
-dir  path=kernel/drv/$(ARCH64) group=sys
-file path=kernel/drv/$(ARCH64)/qfe group=sys
-driver name=qfe alias=SUNW,qfe
-legacy pkg=SUNWqfed desc="Sun Quad FastEtherent PCI/SBus Adapter" \
-    name="Sun Quad FastEthernet Adapter Driver"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-socal.p5m b/usr/src/pkg/manifests/driver-network-socal.p5m
deleted file mode 100644
index 654e809323..0000000000
--- a/usr/src/pkg/manifests/driver-network-socal.p5m
+++ /dev/null
@@ -1,49 +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/network/socal@$(PKGVERS)
-set name=pkg.summary value="Sun Enterprise Network Array socal Device Driver"
-set name=pkg.description \
-    value="Sun Enterprise Network Array socal Device Driver"
-set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage
-set name=variant.arch value=sparc
-dir  path=kernel group=sys
-dir  path=kernel/drv group=sys
-dir  path=kernel/drv/$(ARCH64) group=sys
-file path=kernel/drv/$(ARCH64)/socal group=sys
-dir  path=usr/share/man
-dir  path=usr/share/man/man4d
-file path=usr/share/man/man4d/socal.4d
-driver name=socal alias=SUNW,socal
-legacy pkg=SUNWluxl desc="Sun Enterprise Network Array socal Device Driver" \
-    name="Sun Enterprise Network Array socal Device Driver"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-sparc-platform.p5m b/usr/src/pkg/manifests/driver-sparc-platform.p5m
deleted file mode 100644
index a377e47dbb..0000000000
--- a/usr/src/pkg/manifests/driver-sparc-platform.p5m
+++ /dev/null
@@ -1,74 +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/sparc/platform@$(PKGVERS)
-set name=pkg.summary value="PCI Drivers"
-set name=pkg.description value="Drivers for the PCI bus"
-set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports \
-    value=org.opensolaris.category.2008:Drivers/Storage
-set name=variant.arch value=sparc
-dir  path=kernel group=sys
-dir  path=kernel/drv group=sys
-dir  path=kernel/drv/$(ARCH64) group=sys
-file path=kernel/drv/$(ARCH64)/ecpp group=sys
-file path=kernel/drv/$(ARCH64)/glm group=sys
-file path=kernel/drv/$(ARCH64)/mpt group=sys
-file path=kernel/drv/$(ARCH64)/se group=sys
-file path=kernel/drv/ecpp.conf group=sys
-file path=kernel/drv/mpt.conf group=sys preserve=true
-driver name=ecpp perms="* 0666 root sys" \
-    alias=ns87317-ecpp \
-    alias=pnpALI,1533,3
-driver name=glm class=scsi \
-    alias=pci1000,1 \
-    alias=pci1000,b \
-    alias=pci1000,c \
-    alias=pci1000,f \
-    alias=pci1000,20 \
-    alias=pci1000,21
-driver name=mpt class=scsi \
-    alias=pci1000,30 \
-    alias=pci1000,50 \
-    alias=pci1000,54 \
-    alias=pci1000,56 \
-    alias=pci1000,58 \
-    alias=pci1000,62 \
-    alias=pciex1000,56 \
-    alias=pciex1000,58 \
-    alias=pciex1000,62
-driver name=se perms="[0-7],hdlc 0666 root sys" perms="[a-h] 0666 root sys" \
-    perms="[a-h],cu 0600 uucp uucp" perms="ssp 0600 root sys" \
-    perms="sspctl 0600 root sys"
-legacy pkg=SUNWpd desc="Drivers for the PCI bus" name="PCI Drivers"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-license lic_OSBL license=lic_OSBL
-license lic_OSBL_preamble license=lic_OSBL_preamble
diff --git a/usr/src/pkg/manifests/driver-storage-fas-header-fas.p5m b/usr/src/pkg/manifests/driver-storage-fas-header-fas.p5m
deleted file mode 100644
index f4acd1c21b..0000000000
--- a/usr/src/pkg/manifests/driver-storage-fas-header-fas.p5m
+++ /dev/null
@@ -1,44 +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/fas/header-fas@$(PKGVERS)
-set name=pkg.summary value="SunSwift Adapter Headers"
-set name=pkg.description value="SunSwift Adapter Headers"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Networking
-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/fascmd.h
-file path=usr/include/sys/scsi/adapters/fasdma.h
-file path=usr/include/sys/scsi/adapters/fasreg.h
-file path=usr/include/sys/scsi/adapters/fasvar.h
-legacy pkg=SUNWhmdu desc="SunSwift Adapter Headers" \
-    name="SunSwift Adapter Headers"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.p5m b/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
index bd8245393b..92ca5f392c 100644
--- a/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
+++ b/usr/src/pkg/manifests/driver-storage-mr_sas.p5m
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2013 Nexenta Systems, Inc. All rights reserved.
-# Copyright 2015 Garrett D'Amore <garrett@damore.org>
+# Copyright 2022 Garrett D'Amore <garrett@damore.org>
 # Copyright 2017 Citrus IT Limited. All rights reserved.
 #
 
@@ -45,21 +45,7 @@ file path=kernel/drv/mr_sas.conf group=sys
 dir  path=usr/share/man
 dir  path=usr/share/man/man4d
 file path=usr/share/man/man4d/mr_sas.4d
-$(sparc_ONLY)driver name=mr_sas class=scsi-self-identifying \
-    alias=pci1000,78 \
-    alias=pci1000,79 \
-    alias=pciex1000,52 \
-    alias=pciex1000,53 \
-    alias=pciex1000,5b \
-    alias=pciex1000,5d \
-    alias=pciex1000,5f \
-    alias=pciex1000,71 \
-    alias=pciex1000,73 \
-    alias=pciex1000,78 \
-    alias=pciex1000,79 \
-    alias=pciex1000,ce \
-    alias=pciex1000,cf
-$(i386_ONLY)driver name=mr_sas class=scsi-self-identifying \
+driver name=mr_sas class=scsi-self-identifying \
     alias=pciex1000,52 \
     alias=pciex1000,53 \
     alias=pciex1000,5b \
diff --git a/usr/src/pkg/manifests/driver-storage-sdcard.p5m b/usr/src/pkg/manifests/driver-storage-sdcard.p5m
index d69a59056c..fb20d4ba04 100644
--- a/usr/src/pkg/manifests/driver-storage-sdcard.p5m
+++ b/usr/src/pkg/manifests/driver-storage-sdcard.p5m
@@ -33,24 +33,21 @@ set name=pkg.fmri value=pkg:/driver/storage/sdcard@$(PKGVERS)
 set name=pkg.summary value="SD/MMC Drivers"
 set name=pkg.description value="SD/MMC Drivers"
 set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage
-# SUNWsdcard doesn't deliver anything for sparc, but we keep delivering
-# the package on sparc because we can't use direct obsolete support to
-# obsolete only one variant.
 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
-$(i386_ONLY)file path=kernel/drv/$(ARCH64)/sdhost group=sys
-$(i386_ONLY)dir path=kernel/misc group=sys
-$(i386_ONLY)dir path=kernel/misc/$(ARCH64) group=sys
-$(i386_ONLY)file path=kernel/misc/$(ARCH64)/sda group=sys mode=0755
-$(i386_ONLY)dir path=usr/share/man
-$(i386_ONLY)dir path=usr/share/man/man4d
-$(i386_ONLY)file path=usr/share/man/man4d/sda.4d
-$(i386_ONLY)file path=usr/share/man/man4d/sdhost.4d
-$(i386_ONLY)driver name=sdhost perms="* 0644 root root" \
+dir  path=kernel group=sys
+dir  path=kernel/drv group=sys
+dir  path=kernel/drv/$(ARCH64) group=sys
+file path=kernel/drv/$(ARCH64)/sdhost group=sys
+dir  path=kernel/misc group=sys
+dir  path=kernel/misc/$(ARCH64) group=sys
+file path=kernel/misc/$(ARCH64)/sda group=sys mode=0755
+dir  path=usr/share/man
+dir  path=usr/share/man/man4d
+file path=usr/share/man/man4d/sda.4d
+file path=usr/share/man/man4d/sdhost.4d
+driver name=sdhost perms="* 0644 root root" \
     alias=pciclass,080500 \
     alias=pciclass,080501
-$(i386_ONLY)legacy pkg=SUNWsdcard desc="SD/MMC Drivers" name="SD/MMC Drivers"
-$(i386_ONLY)license cr_Sun license=cr_Sun
-$(i386_ONLY)license lic_CDDL license=lic_CDDL
+legacy pkg=SUNWsdcard desc="SD/MMC Drivers" name="SD/MMC Drivers"
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-sf.p5m b/usr/src/pkg/manifests/driver-storage-sf.p5m
deleted file mode 100644
index 27e6ae786c..0000000000
--- a/usr/src/pkg/manifests/driver-storage-sf.p5m
+++ /dev/null
@@ -1,52 +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/sf@$(PKGVERS)
-set name=pkg.summary value="Sun Enterprise Network Array sf Device Driver"
-set name=pkg.description value="Sun Enterprise Network Array sf Device Driver"
-set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage
-set name=variant.arch value=sparc
-dir  path=platform group=sys
-dir  path=platform/sun4u group=sys
-dir  path=platform/sun4u/kernel group=sys
-dir  path=platform/sun4u/kernel/drv group=sys
-dir  path=platform/sun4u/kernel/drv/$(ARCH64) group=sys
-file path=platform/sun4u/kernel/drv/$(ARCH64)/sf group=sys
-file path=platform/sun4u/kernel/drv/sf.conf group=sys
-dir  path=usr/share/man
-dir  path=usr/share/man/man4d
-file path=usr/share/man/man4d/sf.4d
-driver name=sf
-legacy pkg=SUNWluxd.u arch=$(ARCH).sun4u \
-    desc="Sun Enterprise Network Array sf Device Driver" \
-    name="Sun Enterprise Network Array sf Device Driver"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-ssd.p5m b/usr/src/pkg/manifests/driver-storage-ssd.p5m
deleted file mode 100644
index 0d83219882..0000000000
--- a/usr/src/pkg/manifests/driver-storage-ssd.p5m
+++ /dev/null
@@ -1,53 +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/ssd@$(PKGVERS)
-set name=pkg.summary value="SPARCstorage Array Drivers"
-set name=pkg.description value="ssd kernel device driver"
-set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage
-set name=variant.arch value=sparc
-dir  path=kernel group=sys
-dir  path=kernel/drv group=sys
-dir  path=kernel/drv/$(ARCH64) group=sys
-file path=kernel/drv/$(ARCH64)/ssd group=sys
-file path=kernel/drv/ssd.conf group=sys \
-    original_name=SUNWssad:kernel/drv/ssd.conf preserve=true
-dir  path=usr/share/man
-dir  path=usr/share/man/man4d
-file path=usr/share/man/man4d/ssd.4d
-driver name=ssd perms="* 0640 root sys" \
-    alias=SUNW,ssd \
-    alias=scsa,00.bfcp \
-    alias=scsa,00.bvhci
-legacy pkg=SUNWssad desc="ssd kernel device driver" \
-    name="SPARCstorage Array Drivers"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/install-beadm.p5m b/usr/src/pkg/manifests/install-beadm.p5m
index 623196c8dd..18ee8551fc 100644
--- a/usr/src/pkg/manifests/install-beadm.p5m
+++ b/usr/src/pkg/manifests/install-beadm.p5m
@@ -49,9 +49,4 @@ dir  path=usr/share/man/man8
 file path=usr/share/man/man8/beadm.8
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(python3_ONLY)depend type=conditional \
-    fmri=system/library/python/libbe$(PYTHON3_PKGVERS) \
-    predicate=runtime/python$(PYTHON3_PKGVERS)
-$(python2_ONLY)depend type=conditional \
-    fmri=system/library/python/libbe$(PYTHON_PKGVERS) \
-    predicate=runtime/python$(PYTHON_PKGVERS)
+
diff --git a/usr/src/pkg/manifests/service-fault-management.p5m b/usr/src/pkg/manifests/service-fault-management.p5m
index 1debb139d6..3cc7595610 100644
--- a/usr/src/pkg/manifests/service-fault-management.p5m
+++ b/usr/src/pkg/manifests/service-fault-management.p5m
@@ -198,10 +198,6 @@ link path=usr/lib/fm/$(ARCH64)/libfmnotify.so target=./libfmnotify.so.1 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/$(ARCH64)/libfmnotify.so.1 \
     variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libldom.so target=libldom.so.1
-$(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/libldom.so.1
-$(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libmdesc.so target=libmdesc.so.1
-$(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/libmdesc.so.1
 link path=usr/lib/fm/$(ARCH64)/libseslog.so target=./libseslog.so.1
 file path=usr/lib/fm/$(ARCH64)/libseslog.so.1
 link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 \
@@ -232,20 +228,12 @@ file path=usr/lib/fm/dict/PCI.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/PCIEX.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/fm/dict/SCF.dict mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/SENSOR.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/SMF.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/STORAGE.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4.dict mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4U.dict mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4V.dict mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/SUNOS.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/ZFS.dict mode=0444 \
@@ -416,10 +404,6 @@ link path=usr/lib/fm/libfmevent.so.1 target=../../../lib/fm/libfmevent.so.1 \
 link path=usr/lib/fm/libfmnotify.so target=libfmnotify.so.1 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/libfmnotify.so.1 variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)link path=usr/lib/fm/libldom.so target=libldom.so.1
-$(sparc_ONLY)file path=usr/lib/fm/libldom.so.1
-$(sparc_ONLY)link path=usr/lib/fm/libmdesc.so target=libmdesc.so.1
-$(sparc_ONLY)file path=usr/lib/fm/libmdesc.so.1
 link path=usr/lib/fm/libseslog.so target=libseslog.so.1
 file path=usr/lib/fm/libseslog.so.1
 link path=usr/lib/fm/libtopo.so target=libtopo.so.1 \
@@ -470,20 +454,12 @@ file path=usr/lib/locale/C/LC_MESSAGES/PCI.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/PCIEX.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SCF.mo mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/SMF.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4.mo mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.mo mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
-$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4V.mo mode=0444 \
-    variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/SUNOS.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/ZFS.mo mode=0444 \
@@ -498,205 +474,6 @@ dir  path=usr/lib/mdb/proc group=sys
 file path=usr/lib/mdb/proc/eft.so group=sys mode=0555
 file path=usr/lib/mdb/proc/fmd.so group=sys mode=0555
 dir  path=usr/platform group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins
-#
-# Platform-specific fmd plugins are global zone only
-#
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.conf
-#
-# symlinks for fmd plugins for particular platforms
-#
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP3060/lib/fm/topo/maps/Netra-CP3060-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps/Netra-CP3260-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps/Netra-T5220-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps/Netra-T5440-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps/SPARC-Enterprise-T5120-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps/SPARC-Enterprise-T5220-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd/plugins/cpumem-retire.conf
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd/plugins/cpumem-retire.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd/plugins/event-transport.conf
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd/plugins/event-transport.so \
-    mode=0555
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/topo/maps/SPARC-Enterprise-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/topo/plugins
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/topo/plugins/ioboard.so \
-    mode=0555
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-T6300/lib/fm/topo/maps/Sun-Blade-T6300-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/topo/maps/Sun-Blade-T6320-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Netra-T2000-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/SPARC-Enterprise-T1000-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/SPARC-Enterprise-T2000-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Fire-T1000-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/topo/maps/Sun-Fire-T200-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/maps/Sun-Fire-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins/ioboard.so mode=0555
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,T5140/lib/fm/topo/maps/Sun-Blade-T6340-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,T5140/lib/fm/topo/maps/T5140-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,T5140/lib/fm/topo/maps/T5240-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,T5140/lib/fm/topo/maps/T5440-hc-topology.xml \
-    mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib/fm
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.so \
-    target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps/USBRDT-5240-hc-topology.xml \
-    mode=0444
 $(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/fm
@@ -897,92 +674,6 @@ $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/hostbridge.so \
     mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so mode=0555
-$(sparc_ONLY)dir path=usr/platform/sun4u group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm/eft
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/fire.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/oberon.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/psycho.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/schizo.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/tomatillo.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/xmits.eft mode=0444
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/USII-io-diagnosis.conf
-$(sparc_ONLY)file \
-    path=usr/platform/sun4u/lib/fm/fmd/plugins/USII-io-diagnosis.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.conf
-$(sparc_ONLY)file \
-    path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.conf
-$(sparc_ONLY)file \
-    path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.so mode=0555
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/sun4u/lib/fm/topo/maps/sun4u-hc-topology.xml mode=0444
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fm/topo/plugins
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/chip.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/hostbridge.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/pcibus.so \
-    mode=0555
-$(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
-$(sparc_ONLY)dir path=usr/platform/sun4v/include/sys/fm
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/fm/ldom.h
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/eft
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/fire.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/gcpu.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/gmem.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/n2niu_xaui.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/n2niu_xfp.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/n2piu.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/sp.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/vfncx.eft mode=0444
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/zambezi.eft mode=0444
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/fmd
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/fmd/plugins
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.conf
-$(sparc_ONLY)file \
-    path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.conf
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/etm.conf
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/etm.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/generic-mem.conf
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/generic-mem.so \
-    mode=0555
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo/maps
-$(sparc_ONLY)file \
-    path=usr/platform/sun4v/lib/fm/topo/maps/sun4v-hc-topology.xml mode=0444
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo/plugins
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/chip.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/cpuboard.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/dimm.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/hostbridge.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/motherboard.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/niu.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/pcibus.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/platform-cpu.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/platform-mem.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/sun4vpi.so \
-    mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/xaui.so mode=0555
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/zambezi.so \
-    mode=0555
 #
 # Some directories common to both global and non-global zones:
 #
diff --git a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.p5m b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.p5m
deleted file mode 100644
index 92681985ec..0000000000
--- a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.p5m
+++ /dev/null
@@ -1,36 +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.
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/service/key-management/sun-fire-15000@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/service-picl.p5m b/usr/src/pkg/manifests/service-picl.p5m
index 0463084783..ee7e5d94a6 100644
--- a/usr/src/pkg/manifests/service-picl.p5m
+++ b/usr/src/pkg/manifests/service-picl.p5m
@@ -62,725 +62,8 @@ file path=usr/lib/picl/plugins/libpiclmemcfg.so.1 group=sys
 dir  path=usr/lib/sysevent
 dir  path=usr/lib/sysevent/modules
 file path=usr/lib/sysevent/modules/picl_slm.so
-$(sparc_ONLY)dir path=usr/platform group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl/plugins group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/envmodel.conf \
-    group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so \
-    target=./libpiclenvd.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so.1 \
-    group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T12/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib/picl/plugins group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-T12/lib/picl/plugins/libpiclfrutree.so \
-    target=libpiclfrutree.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T12/lib/picl/plugins/libpiclfrutree.so.1 \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T4/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/fcal_leds.conf group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/libfcal_leds.so \
-    target=libfcal_leds.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/libfcal_leds.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/picldevtree.conf group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/piclfrutree.conf group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/envmodel.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclenvd.so \
-    target=./libpiclenvd.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclenvd.so.1 \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so \
-    target=./libpiclmemcfg.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-1000/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/envmodel.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclenvd.so \
-    target=./libpiclenvd.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclenvd.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-1500/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/envmodel.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclenvd.so \
-    target=./libpiclenvd.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclenvd.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-2500/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/envmodel.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclenvd.so \
-    target=./libpiclenvd.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclenvd.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so \
-    target=./libpsvcpolicy_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so.1 group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrutree.so \
-    target=./libpiclfrutree.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrutree.so.1 \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so \
-    target=./libpsvcplugin.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1 \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin_psr.so \
-    target=./libpsvcplugin_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin_psr.so.1 \
-    group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/picldevtree.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-280R/lib/platsvcd.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-280R/lib/psvcobj.conf \
-    group=sys mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so \
-    target=./libpsvcpolicy_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so.1 group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins:usr/platform/sun4u/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so \
-    target=./libpiclfrutree.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so.1 \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin.so \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin.so.1 \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so \
-    target=./libpsvcplugin_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so.1 \
-    group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/picldevtree.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/platsvcd.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/psvcobj.conf \
-    group=sys mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so \
-    target=./libpsvcpolicy_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1 group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins:usr/platform/sun4u/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so \
-    target=./libpiclfrutree.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so.1 \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin.so \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin.so.1 \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so \
-    target=./libpsvcplugin_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so.1 \
-    group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/picldevtree.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/platsvcd.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/psvcobj.conf \
-    group=sys mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT4.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT5.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT6.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_HDD3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_PS0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_PS1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_SC.conf group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-4.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/libpiclfrudr.so \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/libpiclfrudr.so.1 \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/picl_asr.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/picldevtree.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/piclenvmon.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_HDD3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_PS0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_PS1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_SC.conf group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_usb-a-1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_usb-a-2.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so \
-    target=libpiclfrudr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/picl_asr.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/picldevtree.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/piclenvmon.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD4.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD5.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD6.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_HDD7.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_PS0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_PS1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_SC.conf group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-a-1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-a-2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-b-1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-b-2.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/libpiclfrudr.so \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/libpiclfrudr.so.1 \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/picl_asr.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/picldevtree.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/piclenvmon.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PS0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PS1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_SC.conf group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/libpiclfrudr.so \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/libpiclfrudr.so.1 \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/picldevtree.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/piclenvmon.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT4.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_FT5.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD4.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD5.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD6.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_HDD7.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS0.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_SC.conf group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-1.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-2.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-3.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-4.conf \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudr.so \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudr.so.1 \
-    target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/picl_asr.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/picldevtree.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/piclenvmon.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/piclfrutree.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so \
-    target=../../SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so.1 \
-    target=../../SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpiclfrutree.so \
-    target=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpiclfrutree.so.1 \
-    target=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin.so \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin.so.1 \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin_psr.so \
-    target=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpsvcplugin_psr.so.1 \
-    target=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/picldevtree.conf \
-    group=sys mode=0444
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/piclfrutree.conf \
-    target=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/piclfrutree.conf
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V490/lib/platsvcd.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V490/lib/psvcobj.conf \
-    group=sys mode=0444
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so \
-    target=../../SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so.1 \
-    target=../../SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpiclfrutree.so \
-    target=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpiclfrutree.so.1 \
-    target=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin.so \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin.so.1 \
-    target=../../../../SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin_psr.so \
-    target=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpsvcplugin_psr.so.1 \
-    target=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/picldevtree.conf \
-    group=sys mode=0444
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/piclfrutree.conf \
-    target=../../../../SUNW,Sun-Fire-880/lib/picl/plugins/piclfrutree.conf
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V890/lib/platsvcd.conf \
-    group=sys mode=0444
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V890/lib/psvcobj.conf \
-    group=sys mode=0444
-$(sparc_ONLY)dir path=usr/platform/sun4u group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/libpsvcobj.so \
-    target=./libpsvcobj.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/libpsvcobj.so.1 group=sys
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/libpsvcpolicy.so \
-    target=./libpsvcpolicy.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/libpsvcpolicy.so.1 group=sys \
-    pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/picl/plugins group=sys
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/picl/plugins/libpiclenvmon.so \
-    target=./libpiclenvmon.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/picl/plugins/libpiclenvmon.so.1 \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/libpiclsnmp.so \
-    target=./libpiclsnmp.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/libpiclsnmp.so.1 group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/picl/plugins group=sys
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/picl/plugins/libmdescplugin.so \
-    target=./libmdescplugin.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libmdescplugin.so.1 \
-    group=sys
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/picl/plugins/libpiclsbl.so \
-    target=./libpiclsbl.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libpiclsbl.so.1 \
-    group=sys
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/picl/plugins/libpriplugin.so \
-    target=./libpriplugin.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libpriplugin.so.1 \
-    group=sys variant.opensolaris.zone=global
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so \
-    target=./libsnmpplugin.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so.1 \
-    group=sys
 dir  path=usr/sbin
 file path=usr/sbin/prtpicl mode=0755
-$(sparc_ONLY)dir path=usr/share/man
 dir  path=usr/share/man/man3lib
 file path=usr/share/man/man3lib/libpicl.3lib
 file path=usr/share/man/man3lib/libpicltree.3lib
diff --git a/usr/src/pkg/manifests/storage-library-network-array.p5m b/usr/src/pkg/manifests/storage-library-network-array.p5m
deleted file mode 100644
index efa085a824..0000000000
--- a/usr/src/pkg/manifests/storage-library-network-array.p5m
+++ /dev/null
@@ -1,51 +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:/storage/library/network-array@$(PKGVERS)
-set name=pkg.summary value="Sun Enterprise Network Array libraries"
-set name=pkg.description value="Sun Enterprise Network Array libraries"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Enterprise Management"
-set name=variant.arch value=sparc
-dir  path=lib
-dir  path=lib/$(ARCH64)
-link path=lib/$(ARCH64)/liba5k.so target=liba5k.so.2
-file path=lib/$(ARCH64)/liba5k.so.2
-link path=lib/$(ARCH64)/libg_fc.so target=libg_fc.so.2
-file path=lib/$(ARCH64)/libg_fc.so.2
-link path=lib/liba5k.so target=liba5k.so.2
-file path=lib/liba5k.so.2
-link path=lib/libg_fc.so target=libg_fc.so.2
-file path=lib/libg_fc.so.2
-legacy pkg=SUNWluxopr desc="Sun Enterprise Network Array libraries" \
-    name="Sun Enterprise Network Array libraries"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-boot-grub.p5m b/usr/src/pkg/manifests/system-boot-grub.p5m
index e785bf632b..0a0490334f 100644
--- a/usr/src/pkg/manifests/system-boot-grub.p5m
+++ b/usr/src/pkg/manifests/system-boot-grub.p5m
@@ -32,10 +32,8 @@
 <include global_zone_only_component>
 set name=pkg.fmri \
     value=pkg:/system/boot/grub@0.97,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
-$(i386_ONLY)set name=pkg.summary value="GNU GRUB - GNU GRand Unified Bootloader"
-$(sparc_ONLY)set name=pkg.summary value=GRUB
-$(sparc_ONLY)set name=pkg.description value="GRUB libraries"
-$(i386_ONLY)set name=pkg.description value="Multiboot Boot Loader"
+set name=pkg.summary value="GNU GRUB - GNU GRand Unified Bootloader"
+set name=pkg.description value="Multiboot Boot Loader"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 $(i386_ONLY)dir path=boot group=sys
@@ -72,7 +70,7 @@ file path=lib/libgrubmgmt.so.1
 dir  path=usr/share/man
 dir  path=usr/share/man/man7
 file path=usr/share/man/man7/grub.7
-$(i386_ONLY)legacy pkg=SUNWgrub desc="Multiboot Boot Loader" \
+legacy pkg=SUNWgrub desc="Multiboot Boot Loader" \
     name="GNU GRUB - GNU GRand Unified Bootloader"
 legacy pkg=SUNWgrubr desc="GRUB libraries" name="GRUB (Root)"
 license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-boot-real-mode.p5m b/usr/src/pkg/manifests/system-boot-real-mode.p5m
index a98e191b26..1972eb9d1d 100644
--- a/usr/src/pkg/manifests/system-boot-real-mode.p5m
+++ b/usr/src/pkg/manifests/system-boot-real-mode.p5m
@@ -28,11 +28,7 @@ set name=pkg.fmri value=pkg:/system/boot/real-mode@$(PKGVERS)
 set name=pkg.summary value="Realmode Modules"
 set name=pkg.description value="Realmode Modules"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
-# SUNWrmod doesn't deliver anything for sparc, but SUNWrmodu was
-# renamed for i386, and we can't obsolete one variant and rename
-# another, so SUNWrmod continues to be delivered as sparc, but
-# empty to satisfy the rename.
-set name=variant.arch value=$(ARCH)
+set name=variant.arch value=i386
 $(i386_ONLY)dir path=boot group=sys
 $(i386_ONLY)dir path=boot/solaris group=sys
 $(i386_ONLY)hardlink path=boot/solaris.xpm target=splashimage.xpm
diff --git a/usr/src/pkg/manifests/system-compatibility-sunos4.p5m b/usr/src/pkg/manifests/system-compatibility-sunos4.p5m
deleted file mode 100644
index c82825c68e..0000000000
--- a/usr/src/pkg/manifests/system-compatibility-sunos4.p5m
+++ /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:/system/compatibility/sunos4@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m b/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
index 3000d49d7e..e0f1de62cd 100644
--- a/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
+++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.p5m
@@ -35,228 +35,6 @@ file path=usr/lib/set_keyboard_layout mode=0555
 dir  path=usr/share
 dir  path=usr/share/lib
 dir  path=usr/share/lib/keytables
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/belgium_france \
-    target=../../../../usr/share/lib/keytables/type_4/belgium_france
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/canada \
-    target=../../../../usr/share/lib/keytables/type_4/canada
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/canadian_french_5 \
-    target=../../../../usr/share/lib/keytables/type_4/canadian_french_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/canadian_french_5_tbits5 \
-    target=../../../../usr/share/lib/keytables/type_4/canadian_french_5_tbits5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/canadian_french_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/canadian_french_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/czech_5 \
-    target=../../../../usr/share/lib/keytables/type_4/czech_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/denmark \
-    target=../../../../usr/share/lib/keytables/type_4/denmark
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/denmark_5 \
-    target=../../../../usr/share/lib/keytables/type_4/denmark_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/denmark_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/denmark_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/france_5 \
-    target=../../../../usr/share/lib/keytables/type_4/france_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/france_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/france_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/germany \
-    target=../../../../usr/share/lib/keytables/type_4/germany
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/germany_5 \
-    target=../../../../usr/share/lib/keytables/type_4/germany_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/germany_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/germany_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/hungary_5 \
-    target=../../../../usr/share/lib/keytables/type_4/hungary_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/italy \
-    target=../../../../usr/share/lib/keytables/type_4/italy
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/italy_5 \
-    target=../../../../usr/share/lib/keytables/type_4/italy_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/italy_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/italy_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/japan \
-    target=../../../../usr/share/lib/keytables/type_4/japan
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/japan_5 \
-    target=../../../../usr/share/lib/keytables/type_4/japan_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/japan_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/japan_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/korea \
-    target=../../../../usr/share/lib/keytables/type_4/korea
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/korea_5 \
-    target=../../../../usr/share/lib/keytables/type_4/korea_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/korea_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/korea_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_00 \
-    target=../../../../usr/share/lib/keytables/type_4/us
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_01 \
-    target=../../../../usr/share/lib/keytables/type_4/us
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_02 \
-    target=../../../../usr/share/lib/keytables/type_4/belgium_france
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_03 \
-    target=../../../../usr/share/lib/keytables/type_4/canada
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_04 \
-    target=../../../../usr/share/lib/keytables/type_4/denmark
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_05 \
-    target=../../../../usr/share/lib/keytables/type_4/germany
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_06 \
-    target=../../../../usr/share/lib/keytables/type_4/italy
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_07 \
-    target=../../../../usr/share/lib/keytables/type_4/netherlands
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_08 \
-    target=../../../../usr/share/lib/keytables/type_4/norway
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_09 \
-    target=../../../../usr/share/lib/keytables/type_4/portugal
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_0a \
-    target=../../../../usr/share/lib/keytables/type_4/spain_latin_america
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_0b \
-    target=../../../../usr/share/lib/keytables/type_4/sweden_finland
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_0c \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_french
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_0d \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_german
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_0e \
-    target=../../../../usr/share/lib/keytables/type_4/uk
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_10 \
-    target=../../../../usr/share/lib/keytables/type_4/korea
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_11 \
-    target=../../../../usr/share/lib/keytables/type_4/traditional_chinese
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_13 \
-    target=../../../../usr/share/lib/keytables/type_4/us101a_pc
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_20 \
-    target=../../../../usr/share/lib/keytables/type_4/japan
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_21 \
-    target=../../../../usr/share/lib/keytables/type_4/us_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_22 \
-    target=../../../../usr/share/lib/keytables/type_4/us_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_23 \
-    target=../../../../usr/share/lib/keytables/type_4/france_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_24 \
-    target=../../../../usr/share/lib/keytables/type_4/denmark_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_25 \
-    target=../../../../usr/share/lib/keytables/type_4/germany_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_26 \
-    target=../../../../usr/share/lib/keytables/type_4/italy_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_27 \
-    target=../../../../usr/share/lib/keytables/type_4/netherlands_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_28 \
-    target=../../../../usr/share/lib/keytables/type_4/norway_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_29 \
-    target=../../../../usr/share/lib/keytables/type_4/portugal_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_2a \
-    target=../../../../usr/share/lib/keytables/type_4/spain_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_2b \
-    target=../../../../usr/share/lib/keytables/type_4/sweden_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_2c \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_french_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_2d \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_german_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_2e \
-    target=../../../../usr/share/lib/keytables/type_4/uk_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_2f \
-    target=../../../../usr/share/lib/keytables/type_4/korea_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_30 \
-    target=../../../../usr/share/lib/keytables/type_4/traditional_chinese_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_31 \
-    target=../../../../usr/share/lib/keytables/type_4/japan_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_32 \
-    target=../../../../usr/share/lib/keytables/type_4/canadian_french_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_33 \
-    target=../../../../usr/share/lib/keytables/type_4/hungary_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_34 \
-    target=../../../../usr/share/lib/keytables/type_4/poland_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_35 \
-    target=../../../../usr/share/lib/keytables/type_4/czech_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_36 \
-    target=../../../../usr/share/lib/keytables/type_4/russia_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_3f \
-    target=../../../../usr/share/lib/keytables/type_4/canadian_french_5_tbits5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_50 \
-    target=../../../../usr/share/lib/keytables/type_4/us_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_51 \
-    target=../../../../usr/share/lib/keytables/type_4/us_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_52 \
-    target=../../../../usr/share/lib/keytables/type_4/france_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_53 \
-    target=../../../../usr/share/lib/keytables/type_4/denmark_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_54 \
-    target=../../../../usr/share/lib/keytables/type_4/germany_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_55 \
-    target=../../../../usr/share/lib/keytables/type_4/italy_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_56 \
-    target=../../../../usr/share/lib/keytables/type_4/netherlands_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_57 \
-    target=../../../../usr/share/lib/keytables/type_4/norway_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_58 \
-    target=../../../../usr/share/lib/keytables/type_4/portugal_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_59 \
-    target=../../../../usr/share/lib/keytables/type_4/spain_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_5a \
-    target=../../../../usr/share/lib/keytables/type_4/sweden_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_5b \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_french_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_5c \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_german_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_5d \
-    target=../../../../usr/share/lib/keytables/type_4/uk_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_5e \
-    target=../../../../usr/share/lib/keytables/type_4/korea_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_5f \
-    target=../../../../usr/share/lib/keytables/type_4/traditional_chinese_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_60 \
-    target=../../../../usr/share/lib/keytables/type_4/japan_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/layout_61 \
-    target=../../../../usr/share/lib/keytables/type_4/canadian_french_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/netherlands \
-    target=../../../../usr/share/lib/keytables/type_4/netherlands
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/netherlands_5 \
-    target=../../../../usr/share/lib/keytables/type_4/netherlands_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/netherlands_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/netherlands_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/norway \
-    target=../../../../usr/share/lib/keytables/type_4/norway
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/norway_5 \
-    target=../../../../usr/share/lib/keytables/type_4/norway_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/norway_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/norway_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/poland_5 \
-    target=../../../../usr/share/lib/keytables/type_4/poland_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/portugal \
-    target=../../../../usr/share/lib/keytables/type_4/portugal
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/portugal_5 \
-    target=../../../../usr/share/lib/keytables/type_4/portugal_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/portugal_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/portugal_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/reset \
-    target=../../../../usr/share/lib/keytables/type_4/reset
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/russia_5 \
-    target=../../../../usr/share/lib/keytables/type_4/russia_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/spain_5 \
-    target=../../../../usr/share/lib/keytables/type_4/spain_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/spain_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/spain_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/spain_latin_america \
-    target=../../../../usr/share/lib/keytables/type_4/spain_latin_america
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/sweden_5 \
-    target=../../../../usr/share/lib/keytables/type_4/sweden_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/sweden_finland \
-    target=../../../../usr/share/lib/keytables/type_4/sweden_finland
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/sweden_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/sweden_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/swiss_french \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_french
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/swiss_french_5 \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_french_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/swiss_french_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_french_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/swiss_german \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_german
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/swiss_german_5 \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_german_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/swiss_german_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/swiss_german_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/traditional_chinese \
-    target=../../../../usr/share/lib/keytables/type_4/traditional_chinese
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/traditional_chinese_5 \
-    target=../../../../usr/share/lib/keytables/type_4/traditional_chinese_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/traditional_chinese_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/traditional_chinese_hobo
 dir  path=usr/share/lib/keytables/type_101
 file path=usr/share/lib/keytables/type_101/canadian_french2
 file path=usr/share/lib/keytables/type_101/czech
@@ -341,185 +119,6 @@ file path=usr/share/lib/keytables/type_101/traditional_chinese
 file path=usr/share/lib/keytables/type_101/turkey
 file path=usr/share/lib/keytables/type_101/uk
 file path=usr/share/lib/keytables/type_101/us
-$(sparc_ONLY)dir path=usr/share/lib/keytables/type_4
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/belgium_france
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/canada
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/canadian_french_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/canadian_french_5_tbits5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/canadian_french_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/czech_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/denmark
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/denmark_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/denmark_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/france_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/france_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/germany
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/germany_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/germany_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/hungary_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/italy
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/italy_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/italy_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/japan
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/japan_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/japan_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/korea
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/korea_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/korea_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_00 \
-    target=../../../../../usr/share/lib/keytables/type_4/us
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_01 \
-    target=../../../../../usr/share/lib/keytables/type_4/us
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_02 \
-    target=../../../../../usr/share/lib/keytables/type_4/belgium_france
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_03 \
-    target=../../../../../usr/share/lib/keytables/type_4/canada
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_04 \
-    target=../../../../../usr/share/lib/keytables/type_4/denmark
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_05 \
-    target=../../../../../usr/share/lib/keytables/type_4/germany
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_06 \
-    target=../../../../../usr/share/lib/keytables/type_4/italy
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_07 \
-    target=../../../../../usr/share/lib/keytables/type_4/netherlands
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_08 \
-    target=../../../../../usr/share/lib/keytables/type_4/norway
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_09 \
-    target=../../../../../usr/share/lib/keytables/type_4/portugal
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_0a \
-    target=../../../../../usr/share/lib/keytables/type_4/spain_latin_america
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_0b \
-    target=../../../../../usr/share/lib/keytables/type_4/sweden_finland
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_0c \
-    target=../../../../../usr/share/lib/keytables/type_4/swiss_french
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_0d \
-    target=../../../../../usr/share/lib/keytables/type_4/swiss_german
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_0e \
-    target=../../../../../usr/share/lib/keytables/type_4/uk
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_10 \
-    target=../../../../../usr/share/lib/keytables/type_4/korea
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_11 \
-    target=../../../../../usr/share/lib/keytables/type_4/traditional_chinese
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_13 \
-    target=../../../../../usr/share/lib/keytables/type_4/us101a_pc
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_20 \
-    target=../../../../../usr/share/lib/keytables/type_4/japan
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_21 \
-    target=../../../../../usr/share/lib/keytables/type_4/us_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_22 \
-    target=../../../../../usr/share/lib/keytables/type_4/us_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_23 \
-    target=../../../../../usr/share/lib/keytables/type_4/france_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_24 \
-    target=../../../../../usr/share/lib/keytables/type_4/denmark_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_25 \
-    target=../../../../../usr/share/lib/keytables/type_4/germany_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_26 \
-    target=../../../../../usr/share/lib/keytables/type_4/italy_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_27 \
-    target=../../../../../usr/share/lib/keytables/type_4/netherlands_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_28 \
-    target=../../../../../usr/share/lib/keytables/type_4/norway_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_29 \
-    target=../../../../../usr/share/lib/keytables/type_4/portugal_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_2a \
-    target=../../../../../usr/share/lib/keytables/type_4/spain_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_2b \
-    target=../../../../../usr/share/lib/keytables/type_4/sweden_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_2c \
-    target=../../../../../usr/share/lib/keytables/type_4/swiss_french_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_2d \
-    target=../../../../../usr/share/lib/keytables/type_4/swiss_german_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_2e \
-    target=../../../../../usr/share/lib/keytables/type_4/uk_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_2f \
-    target=../../../../../usr/share/lib/keytables/type_4/korea_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_30 \
-    target=../../../../../usr/share/lib/keytables/type_4/traditional_chinese_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_31 \
-    target=../../../../../usr/share/lib/keytables/type_4/japan_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_32 \
-    target=../../../../../usr/share/lib/keytables/type_4/canadian_french_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_33 \
-    target=../../../../../usr/share/lib/keytables/type_4/hungary_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_34 \
-    target=../../../../../usr/share/lib/keytables/type_4/poland_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_35 \
-    target=../../../../../usr/share/lib/keytables/type_4/czech_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_36 \
-    target=../../../../../usr/share/lib/keytables/type_4/russia_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_3f \
-    target=../../../../../usr/share/lib/keytables/type_4/canadian_french_5_tbits5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_50 \
-    target=../../../../../usr/share/lib/keytables/type_4/us_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_51 \
-    target=../../../../../usr/share/lib/keytables/type_4/us_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_52 \
-    target=../../../../../usr/share/lib/keytables/type_4/france_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_53 \
-    target=../../../../../usr/share/lib/keytables/type_4/denmark_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_54 \
-    target=../../../../../usr/share/lib/keytables/type_4/germany_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_55 \
-    target=../../../../../usr/share/lib/keytables/type_4/italy_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_56 \
-    target=../../../../../usr/share/lib/keytables/type_4/netherlands_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_57 \
-    target=../../../../../usr/share/lib/keytables/type_4/norway_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_58 \
-    target=../../../../../usr/share/lib/keytables/type_4/portugal_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_59 \
-    target=../../../../../usr/share/lib/keytables/type_4/spain_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_5a \
-    target=../../../../../usr/share/lib/keytables/type_4/sweden_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_5b \
-    target=../../../../../usr/share/lib/keytables/type_4/swiss_french_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_5c \
-    target=../../../../../usr/share/lib/keytables/type_4/swiss_german_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_5d \
-    target=../../../../../usr/share/lib/keytables/type_4/uk_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_5e \
-    target=../../../../../usr/share/lib/keytables/type_4/korea_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_5f \
-    target=../../../../../usr/share/lib/keytables/type_4/traditional_chinese_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_60 \
-    target=../../../../../usr/share/lib/keytables/type_4/japan_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/type_4/layout_61 \
-    target=../../../../../usr/share/lib/keytables/type_4/canadian_french_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/netherlands
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/netherlands_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/netherlands_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/norway
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/norway_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/norway_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/poland_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/portugal
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/portugal_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/portugal_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/reset
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/russia_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/spain_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/spain_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/spain_latin_america
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/sweden_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/sweden_finland
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/sweden_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/swiss_french
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/swiss_french_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/swiss_french_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/swiss_german
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/swiss_german_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/swiss_german_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/traditional_chinese
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/traditional_chinese_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/traditional_chinese_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/uk
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/uk_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/uk_hobo
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us101a_pc
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us_5
-$(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us_hobo
 dir  path=usr/share/lib/keytables/type_6
 file path=usr/share/lib/keytables/type_6/albania
 file path=usr/share/lib/keytables/type_6/arabia
@@ -665,20 +264,6 @@ file path=usr/share/lib/keytables/type_6/turkeyf
 file path=usr/share/lib/keytables/type_6/turkeyq
 file path=usr/share/lib/keytables/type_6/uk
 file path=usr/share/lib/keytables/type_6/us
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/uk \
-    target=../../../../usr/share/lib/keytables/type_4/uk
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/uk_5 \
-    target=../../../../usr/share/lib/keytables/type_4/uk_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/uk_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/uk_hobo
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/us \
-    target=../../../../usr/share/lib/keytables/type_4/us
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/us101a_pc \
-    target=../../../../usr/share/lib/keytables/type_4/us101a_pc
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/us_5 \
-    target=../../../../usr/share/lib/keytables/type_4/us_5
-$(sparc_ONLY)hardlink path=usr/share/lib/keytables/us_hobo \
-    target=../../../../usr/share/lib/keytables/type_4/us_hobo
 dir  path=usr/share/man
 dir  path=usr/share/man/man5
 file path=usr/share/man/man5/keytables.5
diff --git a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
deleted file mode 100644
index a2fba8533d..0000000000
--- a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.p5m
+++ /dev/null
@@ -1,64 +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:/system/domain-configuration/sparc-enterprise@$(PKGVERS)
-set name=pkg.summary value="Domain Configuration Server"
-set name=pkg.description value="Domain Configuration Server"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=variant.arch value=sparc
-dir  path=lib
-dir  path=lib/svc
-dir  path=lib/svc/manifest group=sys
-dir  path=lib/svc/manifest/platform group=sys
-dir  path=lib/svc/manifest/platform/sun4u group=sys
-file path=lib/svc/manifest/platform/sun4u/dcs.xml group=sys mode=0444
-file path=lib/svc/manifest/platform/sun4u/oplhpd.xml group=sys mode=0444
-dir  path=lib/svc/method
-file path=lib/svc/method/svc-dcs mode=0555
-file path=lib/svc/method/svc-oplhpd mode=0555
-dir  path=usr group=sys
-dir  path=usr/lib
-file path=usr/lib/dcs mode=0755
-dir  path=usr/platform group=sys
-dir  path=usr/platform/SUNW,SPARC-Enterprise group=sys
-dir  path=usr/platform/SUNW,SPARC-Enterprise/lib
-dir  path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64)
-file path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64)/oplhpd mode=0755
-dir  path=usr/share/man/man8
-file path=usr/share/man/man8/dcs.8
-file path=usr/share/man/man8/oplhpd.8
-legacy pkg=SUNWdcsr desc="Domain Configuration Server, (Root)" \
-    name="Domain Configuration Server, (Root)"
-legacy pkg=SUNWdcsu desc="Domain Configuration Server" \
-    name="Domain Configuration Server"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
deleted file mode 100644
index ce8afb8df8..0000000000
--- a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.p5m
+++ /dev/null
@@ -1,90 +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.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/system/domain-service-processor-protocol/sparc-enterprise@$(PKGVERS)
-set name=pkg.summary value="Domain to Service Processor Communications Protocol"
-set name=pkg.description \
-    value="Domain to Service Processor Communications Protocol"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=variant.arch value=sparc
-dir  path=lib
-dir  path=lib/svc
-dir  path=lib/svc/manifest group=sys
-dir  path=lib/svc/manifest/platform group=sys
-dir  path=lib/svc/manifest/platform/sun4u group=sys
-file path=lib/svc/manifest/platform/sun4u/dscp.xml group=sys mode=0444
-file path=lib/svc/manifest/platform/sun4u/sckmd.xml group=sys mode=0444
-dir  path=lib/svc/method
-file path=lib/svc/method/svc-dscp mode=0555
-file path=lib/svc/method/svc-sckmd mode=0555
-dir  path=platform group=sys
-dir  path=platform/SUNW,SPARC-Enterprise group=sys
-dir  path=platform/SUNW,SPARC-Enterprise/kernel group=sys
-dir  path=platform/SUNW,SPARC-Enterprise/kernel/drv group=sys
-dir  path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64) group=sys
-file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/dm2s group=sys
-file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplkmdrv group=sys
-file path=platform/SUNW,SPARC-Enterprise/kernel/drv/dm2s.conf group=sys
-file path=platform/SUNW,SPARC-Enterprise/kernel/drv/oplkmdrv.conf group=sys
-dir  path=usr group=sys
-dir  path=usr/platform group=sys
-dir  path=usr/platform/SUNW,SPARC-Enterprise group=sys
-dir  path=usr/platform/SUNW,SPARC-Enterprise/lib
-file path=usr/platform/SUNW,SPARC-Enterprise/lib/dscp.ppp.options group=sys \
-    mode=0555
-link path=usr/platform/SUNW,SPARC-Enterprise/lib/libdscp.so \
-    target=./libdscp.so.1
-file path=usr/platform/SUNW,SPARC-Enterprise/lib/libdscp.so.1
-dir  path=usr/platform/SUNW,SPARC-Enterprise/sbin
-file path=usr/platform/SUNW,SPARC-Enterprise/sbin/prtdscp mode=0755
-dir  path=usr/platform/sun4u group=sys
-dir  path=usr/platform/sun4u/lib
-file path=usr/platform/sun4u/lib/sckmd group=sys mode=0755
-dir  path=usr/share/man
-dir  path=usr/share/man/man4d
-file path=usr/share/man/man4d/dm2s.4d
-file path=usr/share/man/man4d/oplkmdrv.4d
-dir  path=usr/share/man/man8
-file path=usr/share/man/man8/prtdscp.8
-file path=usr/share/man/man8/sckmd.8
-driver name=dm2s
-driver name=oplkmdrv
-legacy pkg=SUNWdscpr.u arch=$(ARCH).sun4u \
-    desc="Domain to Service Processor Communications Protocol (Root)" \
-    name="Domain to Service Processor Communications Protocol (Root)"
-legacy pkg=SUNWdscpu.u arch=$(ARCH).sun4u \
-    desc="Domain to Service Processor Communications Protocol (Kvm)" \
-    name="Domain to Service Processor Communications Protocol (Kvm)"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-dtrace-tests.p5m b/usr/src/pkg/manifests/system-dtrace-tests.p5m
index 4f26d92757..1ddf3033fa 100644
--- a/usr/src/pkg/manifests/system-dtrace-tests.p5m
+++ b/usr/src/pkg/manifests/system-dtrace-tests.p5m
@@ -64,19 +64,12 @@ $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyout.d mode=0444
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyoutstr.d \
     mode=0444
 dir  path=opt/SUNWdtrt/tst/$(ARCH)/pid
-$(sparc_ONLY)file \
-    path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.D_PROC_ALIGN.misaligned.d mode=0444
-$(sparc_ONLY)file \
-    path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.D_PROC_ALIGN.misaligned.exe mode=0555
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.uregswrite1.d mode=0444
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.uregswrite1.exe mode=0555
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.uregswrite2.d mode=0444
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.uregswrite2.exe mode=0555
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.d mode=0444
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.exe mode=0555
-$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.br.d mode=0444
-$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.br.d.out mode=0444
-$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.br.exe mode=0555
 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.branch.d mode=0444
 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.branch.exe mode=0555
 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.embedded.d mode=0444
@@ -87,8 +80,6 @@ $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.exe mode=0555
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.ksh mode=0444
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.uregswrite.d mode=0444
 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.uregswrite.exe mode=0555
-$(sparc_ONLY)dir path=opt/SUNWdtrt/tst/$(ARCH)/usdt
-$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/usdt/tst.tailcall.ksh mode=0444
 dir  path=opt/SUNWdtrt/tst/$(ARCH)/ustack
 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.d mode=0444
 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.d.out mode=0444
@@ -98,8 +89,6 @@ file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.circstack.exe mode=0555
 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.helper.d mode=0444
 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.helper.d.out mode=0444
 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.helper.exe mode=0555
-$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.trapstat.ksh \
-    mode=0444
 dir  path=opt/SUNWdtrt/tst/common
 dir  path=opt/SUNWdtrt/tst/common/aggs
 file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_FUNC.bad.d mode=0444
diff --git a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
deleted file mode 100644
index 70b78bf70d..0000000000
--- a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.p5m
+++ /dev/null
@@ -1,107 +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:/system/embedded-fcode-interpreter@$(PKGVERS)
-set name=pkg.summary value="Embedded FCode Interpreter Drivers"
-set name=pkg.description value="Embedded FCode Interpreter Drivers"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=variant.arch value=sparc
-dir  path=etc group=sys
-dir  path=etc/flash group=sys
-dir  path=etc/flash/postdeployment group=sys
-file path=etc/flash/postdeployment/efcode.cleanup group=sys mode=0744
-dir  path=kernel group=sys
-dir  path=kernel/drv group=sys
-dir  path=kernel/drv/$(ARCH64) group=sys
-file path=kernel/drv/$(ARCH64)/fcode group=sys
-file path=kernel/drv/fcode.conf group=sys
-dir  path=kernel/misc group=sys
-dir  path=kernel/misc/$(ARCH64) group=sys
-file path=kernel/misc/$(ARCH64)/fcodem group=sys mode=0755
-file path=kernel/misc/$(ARCH64)/fcpci group=sys mode=0755
-file path=kernel/misc/$(ARCH64)/pcicfg group=sys mode=0755
-dir  path=lib
-dir  path=lib/svc
-dir  path=lib/svc/manifest group=sys
-dir  path=lib/svc/manifest/platform group=sys
-dir  path=lib/svc/manifest/platform/sun4u group=sys
-file path=lib/svc/manifest/platform/sun4u/efdaemon.xml group=sys mode=0444
-dir  path=lib/svc/manifest/platform/sun4v group=sys
-file path=lib/svc/manifest/platform/sun4v/efdaemon.xml group=sys mode=0444
-dir  path=platform group=sys
-dir  path=platform/sun4u group=sys
-dir  path=platform/sun4u/kernel group=sys
-dir  path=platform/sun4u/kernel/misc group=sys
-dir  path=platform/sun4u/kernel/misc/$(ARCH64) group=sys
-file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwo_cpu group=sys mode=0755
-file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwocfg group=sys mode=0755
-dir  path=usr group=sys
-dir  path=usr/lib
-dir  path=usr/lib/efcode
-dir  path=usr/lib/efcode/$(ARCH64)
-file path=usr/lib/efcode/$(ARCH64)/efdaemon mode=0555
-file path=usr/lib/efcode/$(ARCH64)/fcdriver.so
-file path=usr/lib/efcode/$(ARCH64)/fcode.so
-file path=usr/lib/efcode/$(ARCH64)/fcpackage.so
-file path=usr/lib/efcode/$(ARCH64)/fcthread.so
-file path=usr/lib/efcode/$(ARCH64)/interpreter mode=0555
-file path=usr/lib/efcode/$(ARCH64)/lfc_gptwo.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_gptwo.so target=lfc_gptwo.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_pci.so target=lfc_upa_pci.so
-file path=usr/lib/efcode/$(ARCH64)/lfc_jupiter.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_jupiter.so target=lfc_jupiter.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_pciex.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pci.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pciex.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pciex_pci.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pciex_pciex.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v.so target=lfc_upa.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v_pciex.so target=lfc_upa_pci.so
-file path=usr/lib/efcode/$(ARCH64)/lfc_upa.so
-file path=usr/lib/efcode/$(ARCH64)/lfc_upa_pci.so
-file path=usr/lib/efcode/efcode.sh mode=0555
-dir  path=usr/share/man/man8
-file path=usr/share/man/man8/efdaemon.8
-driver name=fcode
-legacy pkg=SUNWefc.u arch=$(ARCH).sun4u \
-    desc="Embedded FCode Interpreter Drivers" \
-    name="Embedded FCode Interpreter Drivers"
-legacy pkg=SUNWefck desc="Embedded FCode Interpreter" \
-    name="Embedded FCode Interpreter Drivers"
-legacy pkg=SUNWefcl desc="Embedded FCode Libraries" \
-    name="Embedded FCode Libraries"
-legacy pkg=SUNWefcr desc="Embedded FCode Interpreter" \
-    name="Embedded FCode Interpreter (Root)"
-legacy pkg=SUNWefcu desc="Embedded FCode Interpreter" \
-    name="Embedded FCode Interpreter"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.p5m b/usr/src/pkg/manifests/system-file-system-zfs.p5m
index afe1c20709..0623fe917a 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.p5m
+++ b/usr/src/pkg/manifests/system-file-system-zfs.p5m
@@ -119,8 +119,7 @@ dir  path=usr/lib/mdb/kvm group=sys
 dir  path=usr/lib/mdb/kvm/$(ARCH64) group=sys
 file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555
 dir  path=usr/lib/mdb/proc group=sys
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64)
+dir  path=usr/lib/mdb/proc/$(ARCH64)
 file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libzpool.so group=sys mode=0555
 dir  path=usr/lib/sysevent
@@ -153,9 +152,5 @@ license usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash \
     license=usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash
 license usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 \
     license=usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4
-$(python3_ONLY)depend type=conditional \
-    fmri=system/library/python/zfs$(PYTHON3_PKGVERS) \
+depend type=conditional fmri=system/library/python/zfs$(PYTHON3_PKGVERS) \
     predicate=runtime/python$(PYTHON3_PKGVERS)
-$(python2_ONLY)depend type=conditional \
-    fmri=system/library/python/zfs$(PYTHON_PKGVERS) \
-    predicate=runtime/python$(PYTHON_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-floating-point-scrubber.p5m b/usr/src/pkg/manifests/system-floating-point-scrubber.p5m
deleted file mode 100644
index 030563479c..0000000000
--- a/usr/src/pkg/manifests/system-floating-point-scrubber.p5m
+++ /dev/null
@@ -1,34 +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:/system/floating-point-scrubber@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-fru-id-platform.p5m b/usr/src/pkg/manifests/system-fru-id-platform.p5m
index a2da60fbbb..437bd7e3bd 100644
--- a/usr/src/pkg/manifests/system-fru-id-platform.p5m
+++ b/usr/src/pkg/manifests/system-fru-id-platform.p5m
@@ -35,167 +35,10 @@ $(i386_ONLY)dir path=usr/lib
 $(i386_ONLY)dir path=usr/lib/picl group=sys
 $(i386_ONLY)dir path=usr/lib/picl/plugins group=sys
 $(i386_ONLY)file path=usr/lib/picl/plugins/fru_container.conf group=sys
-$(sparc_ONLY)dir path=usr/platform group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclfrudata.conf group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T12/lib/libfruaccess.so \
-    target=libfruaccess.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T12/lib/libfruaccess.so.1 \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins/libpiclfrudata.conf \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fru_container.conf group=sys
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/libfruaccess.so \
-    target=./libfruaccess.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/libfruaccess.so.1 group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/picl/plugins group=sys
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/picl/plugins/libpiclfrudata.so \
-    target=./libpiclfrudata.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/picl/plugins/libpiclfrudata.so.1 \
-    group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/sbin
-$(sparc_ONLY)file path=usr/platform/sun4u/sbin/fruadm group=sys mode=0755
 dir  path=usr/share/man/man8
 file path=usr/share/man/man8/fruadm.8
 $(i386_ONLY)legacy pkg=SUNWfruip.i arch=$(ARCH).i86pc \
     desc="FRU ID platform data module and access library" \
     name="FRU ID Platform Modules (Usr)"
-$(sparc_ONLY)legacy pkg=SUNWfruip.u arch=$(ARCH).sun4u \
-    desc="FRU ID platform data module and access library" \
-    name="FRU ID Platform Modules (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-fru-id.p5m b/usr/src/pkg/manifests/system-fru-id.p5m
index f8a86734dd..1390c0be5d 100644
--- a/usr/src/pkg/manifests/system-fru-id.p5m
+++ b/usr/src/pkg/manifests/system-fru-id.p5m
@@ -34,8 +34,6 @@ dir  path=usr/lib
 dir  path=usr/lib/$(ARCH64)
 link path=usr/lib/$(ARCH64)/libfru.so target=./libfru.so.1
 file path=usr/lib/$(ARCH64)/libfru.so.1
-$(sparc_ONLY)link path=usr/lib/$(ARCH64)/libfrupicl.so target=./libfrupicl.so.1
-$(sparc_ONLY)file path=usr/lib/$(ARCH64)/libfrupicl.so.1
 link path=usr/lib/$(ARCH64)/libfruraw.so target=./libfruraw.so.1
 file path=usr/lib/$(ARCH64)/libfruraw.so.1
 link path=usr/lib/$(ARCH64)/libfrureg.so target=./libfrureg.so.1
@@ -46,10 +44,6 @@ link path=usr/lib/$(ARCH64)/libnvfru.so target=./libnvfru.so.1
 file path=usr/lib/$(ARCH64)/libnvfru.so.1
 link path=usr/lib/libfru.so target=./libfru.so.1
 file path=usr/lib/libfru.so.1
-$(sparc_ONLY)link path=usr/lib/libfrupicl.so target=./libfrupicl.so.1
-$(sparc_ONLY)file path=usr/lib/libfrupicl.so.1
-$(sparc_ONLY)link path=usr/lib/libfrupicltree.so target=./libfrupicltree.so.1
-$(sparc_ONLY)file path=usr/lib/libfrupicltree.so.1
 link path=usr/lib/libfruraw.so target=./libfruraw.so.1
 file path=usr/lib/libfruraw.so.1
 link path=usr/lib/libfrureg.so target=./libfrureg.so.1
@@ -58,8 +52,6 @@ link path=usr/lib/libfruutils.so target=./libfruutils.so.1
 file path=usr/lib/libfruutils.so.1
 link path=usr/lib/libnvfru.so target=./libnvfru.so.1
 file path=usr/lib/libnvfru.so.1
-$(sparc_ONLY)dir path=usr/sbin
-$(sparc_ONLY)file path=usr/sbin/prtfru mode=0755
 dir  path=usr/share/man/man8
 file path=usr/share/man/man8/prtfru.8
 legacy pkg=SUNWfruid desc="FRU ID prtfru command and libfru library" \
diff --git a/usr/src/pkg/manifests/system-header-header-platform.p5m b/usr/src/pkg/manifests/system-header-header-platform.p5m
deleted file mode 100644
index 6bbb98c9e8..0000000000
--- a/usr/src/pkg/manifests/system-header-header-platform.p5m
+++ /dev/null
@@ -1,28 +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-platform@0.5.11,5.11-0.142
-set name=pkg.obsolete value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-header.p5m b/usr/src/pkg/manifests/system-header.p5m
index 0d6a472f4b..f7d91b6e52 100644
--- a/usr/src/pkg/manifests/system-header.p5m
+++ b/usr/src/pkg/manifests/system-header.p5m
@@ -66,7 +66,6 @@ $(i386_ONLY)file path=usr/include/asm/byteorder.h
 $(i386_ONLY)file path=usr/include/asm/clock.h
 $(i386_ONLY)file path=usr/include/asm/cpu.h
 $(i386_ONLY)file path=usr/include/asm/cpuvar.h
-$(sparc_ONLY)file path=usr/include/asm/flush.h
 $(i386_ONLY)file path=usr/include/asm/htable.h
 $(i386_ONLY)file path=usr/include/asm/mmu.h
 file path=usr/include/asm/sunddi.h
@@ -390,7 +389,6 @@ file path=usr/include/libshare.h
 file path=usr/include/libsysevent.h
 file path=usr/include/libsysevent_impl.h
 file path=usr/include/libtsnet.h
-$(sparc_ONLY)file path=usr/include/libv12n.h
 file path=usr/include/libw.h
 file path=usr/include/libzfs.h
 file path=usr/include/libzfs_core.h
@@ -538,7 +536,6 @@ file path=usr/include/rpc/clnt.h
 file path=usr/include/rpc/clnt_soc.h
 file path=usr/include/rpc/clnt_stat.h
 file path=usr/include/rpc/des_crypt.h
-$(sparc_ONLY)file path=usr/include/rpc/ib.h
 file path=usr/include/rpc/key_prot.h
 file path=usr/include/rpc/nettype.h
 file path=usr/include/rpc/pmap_clnt.h
@@ -734,7 +731,6 @@ file path=usr/include/sys/class.h
 file path=usr/include/sys/clconf.h
 file path=usr/include/sys/cmlb.h
 file path=usr/include/sys/cmn_err.h
-$(sparc_ONLY)file path=usr/include/sys/cmpregs.h
 file path=usr/include/sys/compress.h
 file path=usr/include/sys/condvar.h
 file path=usr/include/sys/condvar_impl.h
@@ -829,7 +825,6 @@ file path=usr/include/sys/dkbad.h
 file path=usr/include/sys/dkio.h
 file path=usr/include/sys/dkioc_free_util.h
 file path=usr/include/sys/dklabel.h
-$(sparc_ONLY)file path=usr/include/sys/dkmpio.h
 dir  path=usr/include/sys/dktp
 $(i386_ONLY)file path=usr/include/sys/dktp/altsctr.h
 $(i386_ONLY)file path=usr/include/sys/dktp/cmpkt.h
@@ -888,8 +883,6 @@ file path=usr/include/sys/fc4/linkapp.h
 file path=usr/include/sys/fcntl.h
 file path=usr/include/sys/fdbuffer.h
 file path=usr/include/sys/fdio.h
-$(sparc_ONLY)file path=usr/include/sys/fdreg.h
-$(sparc_ONLY)file path=usr/include/sys/fdvar.h
 file path=usr/include/sys/feature_tests.h
 file path=usr/include/sys/fem.h
 file path=usr/include/sys/file.h
@@ -899,10 +892,6 @@ file path=usr/include/sys/flock.h
 file path=usr/include/sys/flock_impl.h
 dir  path=usr/include/sys/fm
 dir  path=usr/include/sys/fm/cpu
-$(sparc_ONLY)file path=usr/include/sys/fm/cpu/SPARC64-VI.h
-$(sparc_ONLY)file path=usr/include/sys/fm/cpu/UltraSPARC-II.h
-$(sparc_ONLY)file path=usr/include/sys/fm/cpu/UltraSPARC-III.h
-$(sparc_ONLY)file path=usr/include/sys/fm/cpu/UltraSPARC-T1.h
 dir  path=usr/include/sys/fm/fs
 file path=usr/include/sys/fm/fs/zfs.h
 dir  path=usr/include/sys/fm/io
@@ -916,11 +905,6 @@ file path=usr/include/sys/fm/protocol.h
 file path=usr/include/sys/fm/util.h
 file path=usr/include/sys/fork.h
 $(i386_ONLY)file path=usr/include/sys/fp.h
-$(sparc_ONLY)dir path=usr/include/sys/fpu
-$(sparc_ONLY)file path=usr/include/sys/fpu/fpu_simulator.h
-$(sparc_ONLY)file path=usr/include/sys/fpu/fpusystm.h
-$(sparc_ONLY)file path=usr/include/sys/fpu/globals.h
-$(sparc_ONLY)file path=usr/include/sys/fpu/ieee.h
 file path=usr/include/sys/frame.h
 dir  path=usr/include/sys/fs
 file path=usr/include/sys/fs/autofs.h
@@ -967,7 +951,6 @@ file path=usr/include/sys/fs/zfs.h
 file path=usr/include/sys/fs_reparse.h
 file path=usr/include/sys/fs_subr.h
 file path=usr/include/sys/fsid.h
-$(sparc_ONLY)file path=usr/include/sys/fsr.h
 file path=usr/include/sys/fss.h
 file path=usr/include/sys/fssnap.h
 file path=usr/include/sys/fssnap_if.h
@@ -1280,9 +1263,7 @@ $(i386_ONLY)file path=usr/include/sys/sata/sata_hba.h
 file path=usr/include/sys/schedctl.h
 dir  path=usr/include/sys/scsi
 dir  path=usr/include/sys/scsi/adapters
-$(sparc_ONLY)file path=usr/include/sys/scsi/adapters/ifpio.h
 file path=usr/include/sys/scsi/adapters/scsi_vhci.h
-$(sparc_ONLY)file path=usr/include/sys/scsi/adapters/sfvar.h
 dir  path=usr/include/sys/scsi/conf
 file path=usr/include/sys/scsi/conf/autoconf.h
 file path=usr/include/sys/scsi/conf/device.h
@@ -1328,7 +1309,6 @@ file path=usr/include/sys/scsi/targets/ses.h
 file path=usr/include/sys/scsi/targets/sesio.h
 file path=usr/include/sys/scsi/targets/sgendef.h
 file path=usr/include/sys/scsi/targets/smp.h
-$(sparc_ONLY)file path=usr/include/sys/scsi/targets/ssddef.h
 file path=usr/include/sys/scsi/targets/stdef.h
 file path=usr/include/sys/secflags.h
 $(i386_ONLY)file path=usr/include/sys/segment.h
@@ -1339,9 +1319,7 @@ file path=usr/include/sys/sem_impl.h
 file path=usr/include/sys/sema_impl.h
 file path=usr/include/sys/semaphore.h
 file path=usr/include/sys/sendfile.h
-$(sparc_ONLY)file path=usr/include/sys/ser_async.h
 file path=usr/include/sys/ser_sync.h
-$(sparc_ONLY)file path=usr/include/sys/ser_zscc.h
 file path=usr/include/sys/serializer.h
 file path=usr/include/sys/session.h
 file path=usr/include/sys/sha1.h
@@ -1359,11 +1337,6 @@ file path=usr/include/sys/smbios.h
 file path=usr/include/sys/smbios_impl.h
 file path=usr/include/sys/smedia.h
 file path=usr/include/sys/sobject.h
-$(sparc_ONLY)file path=usr/include/sys/socal_cq_defs.h
-$(sparc_ONLY)file path=usr/include/sys/socalio.h
-$(sparc_ONLY)file path=usr/include/sys/socalmap.h
-$(sparc_ONLY)file path=usr/include/sys/socalreg.h
-$(sparc_ONLY)file path=usr/include/sys/socalvar.h
 file path=usr/include/sys/socket.h
 file path=usr/include/sys/socket_impl.h
 file path=usr/include/sys/socket_proto.h
@@ -1531,7 +1504,6 @@ file path=usr/include/sys/xti_xtiopt.h
 file path=usr/include/sys/zcons.h
 file path=usr/include/sys/zmod.h
 file path=usr/include/sys/zone.h
-$(sparc_ONLY)file path=usr/include/sys/zsdev.h
 file path=usr/include/sysexits.h
 file path=usr/include/syslog.h
 file path=usr/include/tar.h
@@ -1567,26 +1539,6 @@ file path=usr/include/utmp.h
 file path=usr/include/utmpx.h
 dir  path=usr/include/uuid
 file path=usr/include/uuid/uuid.h
-$(sparc_ONLY)dir path=usr/include/v7
-$(sparc_ONLY)dir path=usr/include/v7/sys
-$(sparc_ONLY)file path=usr/include/v7/sys/machpcb.h
-$(sparc_ONLY)file path=usr/include/v7/sys/machtrap.h
-$(sparc_ONLY)file path=usr/include/v7/sys/mutex_impl.h
-$(sparc_ONLY)file path=usr/include/v7/sys/privregs.h
-$(sparc_ONLY)file path=usr/include/v7/sys/prom_isa.h
-$(sparc_ONLY)file path=usr/include/v7/sys/psr.h
-$(sparc_ONLY)file path=usr/include/v7/sys/traptrace.h
-$(sparc_ONLY)dir path=usr/include/v9
-$(sparc_ONLY)dir path=usr/include/v9/sys
-$(sparc_ONLY)file path=usr/include/v9/sys/asi.h
-$(sparc_ONLY)file path=usr/include/v9/sys/machpcb.h
-$(sparc_ONLY)file path=usr/include/v9/sys/machtrap.h
-$(sparc_ONLY)file path=usr/include/v9/sys/membar.h
-$(sparc_ONLY)file path=usr/include/v9/sys/mutex_impl.h
-$(sparc_ONLY)file path=usr/include/v9/sys/privregs.h
-$(sparc_ONLY)file path=usr/include/v9/sys/prom_isa.h
-$(sparc_ONLY)file path=usr/include/v9/sys/psr_compat.h
-$(sparc_ONLY)file path=usr/include/v9/sys/vis_simulator.h
 file path=usr/include/valtools.h
 file path=usr/include/values.h
 file path=usr/include/varargs.h
@@ -1623,74 +1575,6 @@ file path=usr/include/xti_inet.h
 file path=usr/include/zone.h
 file path=usr/include/zonestat.h
 dir  path=usr/platform group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,A70/include target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T12/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T4/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1000/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1500/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-2500/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/include \
-    target=../sun4u/include
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-2 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/include target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-250 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-250/include \
-    target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-4 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/include target=../sun4u/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/include \
-    target=../sun4u/include
 $(i386_ONLY)dir path=usr/platform/i86pc group=sys
 $(i386_ONLY)dir path=usr/platform/i86pc/include
 $(i386_ONLY)dir path=usr/platform/i86pc/include/sys
@@ -1740,141 +1624,6 @@ $(i386_ONLY)file path=usr/platform/i86xpv/include/sys/xen_mmu.h
 $(i386_ONLY)file path=usr/platform/i86xpv/include/sys/xpv_impl.h
 $(i386_ONLY)dir path=usr/platform/i86xpv/include/vm
 $(i386_ONLY)file path=usr/platform/i86xpv/include/vm/seg_mf.h
-$(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)file path=usr/platform/sun4u/include/sys/ac.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/async.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cheetahregs.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cherrystone.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/clock.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cmp.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cpc_ultra.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cpr_impl.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cpu_impl.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/cpu_sgnblk_defs.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/daktari.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/ddi_subrdefs.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/dvma.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/ecc_kstat.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/eeprom.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/envctrl.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/envctrl_gen.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/envctrl_ue250.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/envctrl_ue450.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/environ.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/errclassify.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/fhc.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/gpio_87317.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/hpc3130_events.h
-$(sparc_ONLY)dir path=usr/platform/sun4u/include/sys/i2c
-$(sparc_ONLY)dir path=usr/platform/sun4u/include/sys/i2c/clients
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/clients/hpc3130.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/clients/i2c_client.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/clients/lm75.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/clients/max1617.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/clients/pcf8591.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/clients/ssc050.h
-$(sparc_ONLY)dir path=usr/platform/sun4u/include/sys/i2c/misc
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/i2c/misc/i2c_svc.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/idprom.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/intr.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/intreg.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/iocache.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/iommu.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/ivintr.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/lom_io.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/machasi.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/machclock.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/machcpuvar.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/machparam.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/machsystm.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/machthread.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/mem_cache.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memlist_plat.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/memnode.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/mmu.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/nexusdebug.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/opl_hwdesc.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/opl_module.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/prom_debug.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/prom_plat.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/pte.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sbd_ioctl.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/scb.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/simmstat.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/smt.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/spitregs.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sram.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sun4asi.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sysctrl.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sysioerr.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sysiosbus.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/tod.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/todmostek.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/trapstat.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/traptrace.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/vis.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/vm_machparam.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/x_call.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/xc_impl.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/zsmach.h
-$(sparc_ONLY)dir path=usr/platform/sun4u/include/vm
-$(sparc_ONLY)file path=usr/platform/sun4u/include/vm/hat_sfmmu.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/vm/mach_sfmmu.h
-$(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
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/clock.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/cmp.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/cpc_ultra.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/cpu_sgnblk_defs.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/ddi_subrdefs.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/ds_pri.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/ds_snmp.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/dvma.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/eeprom.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/fcode.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/hsvc.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/hypervisor_api.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/idprom.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/intr.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/intreg.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/ivintr.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machasi.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machclock.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machcpuvar.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machintreg.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machparam.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machsystm.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/machthread.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memlist_plat.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memnode.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/mmu.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/nexusdebug.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/niagaraasi.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/niagararegs.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/ntwdt.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/pri.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/prom_debug.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/prom_plat.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/pte.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/qcn.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/scb.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/smt.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/soft_state.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/sun4asi.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/tod.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/trapstat.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/traptrace.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/vis.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/vm_machparam.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/x_call.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/xc_impl.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/sys/zsmach.h
-$(sparc_ONLY)dir path=usr/platform/sun4v/include/vm
-$(sparc_ONLY)file path=usr/platform/sun4v/include/vm/hat_sfmmu.h
-$(sparc_ONLY)file path=usr/platform/sun4v/include/vm/mach_sfmmu.h
 dir  path=usr/share
 dir  path=usr/share/man
 dir  path=usr/share/man/man3
@@ -2204,16 +1953,6 @@ $(i386_ONLY)link path=usr/share/src/uts/i86xpv/sys \
     target=../../../../platform/i86xpv/include/sys
 $(i386_ONLY)link path=usr/share/src/uts/i86xpv/vm \
     target=../../../../platform/i86xpv/include/vm
-$(sparc_ONLY)dir path=usr/share/src/uts/sun4u
-$(sparc_ONLY)link path=usr/share/src/uts/sun4u/sys \
-    target=../../../../platform/sun4u/include/sys
-$(sparc_ONLY)link path=usr/share/src/uts/sun4u/vm \
-    target=../../../../platform/sun4u/include/vm
-$(sparc_ONLY)dir path=usr/share/src/uts/sun4v
-$(sparc_ONLY)link path=usr/share/src/uts/sun4v/sys \
-    target=../../../../platform/sun4v/include/sys
-$(sparc_ONLY)link path=usr/share/src/uts/sun4v/vm \
-    target=../../../../platform/sun4v/include/vm
 dir  path=usr/xpg4
 dir  path=usr/xpg4/include
 file path=usr/xpg4/include/curses.h
diff --git a/usr/src/pkg/manifests/system-kernel-cpu-counters.p5m b/usr/src/pkg/manifests/system-kernel-cpu-counters.p5m
index a365f67f05..291681dc9f 100644
--- a/usr/src/pkg/manifests/system-kernel-cpu-counters.p5m
+++ b/usr/src/pkg/manifests/system-kernel-cpu-counters.p5m
@@ -45,35 +45,9 @@ $(i386_ONLY)dir path=platform/i86pc/kernel/sys group=sys
 $(i386_ONLY)dir path=platform/i86pc/kernel/sys/$(ARCH64) group=sys
 $(i386_ONLY)hardlink path=platform/i86pc/kernel/sys/$(ARCH64)/cpc \
     target=../../drv/$(ARCH64)/cpc
-$(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)file path=platform/sun4u/kernel/drv/$(ARCH64)/cpc group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/cpc.conf group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/sys group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/sys/$(ARCH64) group=sys
-$(sparc_ONLY)hardlink path=platform/sun4u/kernel/sys/$(ARCH64)/cpc \
-    target=../../drv/$(ARCH64)/cpc
-$(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
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/cpc group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/cpc.conf group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/sys group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/sys/$(ARCH64) group=sys
-$(sparc_ONLY)hardlink path=platform/sun4v/kernel/sys/$(ARCH64)/cpc \
-    target=../../drv/$(ARCH64)/cpc
 driver name=cpc perms="shared 0666 root sys"
 $(i386_ONLY)legacy pkg=SUNWcpc.i arch=$(ARCH).i86pc \
     desc="Kernel support for CPU Performance Counters" \
     name="CPU Performance Counter driver"
-$(sparc_ONLY)legacy pkg=SUNWcpc.u arch=$(ARCH).sun4u \
-    desc="Kernel support for CPU Performance Counters" \
-    name="CPU Performance Counter driver"
-$(sparc_ONLY)legacy pkg=SUNWcpc.v arch=$(ARCH).sun4v \
-    desc="Kernel support for CPU Performance Counters" \
-    name="CPU Performance Counter driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.p5m b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.p5m
deleted file mode 100644
index 2b9dd26474..0000000000
--- a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.p5m
+++ /dev/null
@@ -1,66 +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:/system/kernel/cpu/sun4v@$(PKGVERS)
-set name=pkg.summary value=UltraSPARC-T1
-set name=pkg.description value="UltraSPARC-T1 core kernel software"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=variant.arch value=sparc
-dir  path=platform group=sys
-dir  path=platform/sun4v group=sys
-dir  path=platform/sun4v/kernel group=sys
-dir  path=platform/sun4v/kernel/cpu group=sys
-dir  path=platform/sun4v/kernel/cpu/$(ARCH64) group=sys
-file path=platform/sun4v/kernel/cpu/$(ARCH64)/SPARC-T3 group=sys mode=0755
-file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T1 group=sys \
-    mode=0755
-file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2 group=sys \
-    mode=0755
-file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2+ group=sys \
-    mode=0755
-dir  path=platform/sun4v/kernel/pcbe group=sys
-dir  path=platform/sun4v/kernel/pcbe/$(ARCH64) group=sys
-file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T1 \
-    group=sys mode=0755
-file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2 \
-    group=sys mode=0755
-file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2+ \
-    group=sys mode=0755
-file path=platform/sun4v/kernel/pcbe/sparcv9/pcbe.SPARC-T3 group=sys mode=0755
-legacy pkg=SUNWust1.v arch=$(ARCH).sun4v \
-    desc="UltraSPARC-T1 core kernel software" name="UltraSPARC-T1 (Root)"
-legacy pkg=SUNWust2.v arch=$(ARCH).sun4v \
-    desc="UltraSPARC-T2 family core kernel software" \
-    name="UltraSPARC-T2 family (Root)"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-license usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE \
-    license=usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.p5m b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.p5m
deleted file mode 100644
index 3cd4fda628..0000000000
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.p5m
+++ /dev/null
@@ -1,37 +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.
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/system/kernel/dynamic-reconfiguration/sun-fire-15000@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
deleted file mode 100644
index e0d9a68877..0000000000
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.p5m
+++ /dev/null
@@ -1,64 +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:/system/kernel/dynamic-reconfiguration/sun-fire-880@$(PKGVERS)
-set name=pkg.summary value="Sun Fire 880 DR Daemon"
-set name=pkg.description value="Sun Fire 880 DR Daemon"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Enterprise Management"
-set name=variant.arch value=sparc
-dir  path=lib
-dir  path=lib/svc
-dir  path=lib/svc/manifest group=sys
-dir  path=lib/svc/manifest/platform group=sys
-dir  path=lib/svc/manifest/platform/sun4u group=sys
-file path=lib/svc/manifest/platform/sun4u/sf880drd.xml group=sys mode=0444
-dir  path=lib/svc/method
-file path=lib/svc/method/sf880dr mode=0555
-dir  path=usr group=sys
-dir  path=usr/platform group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-880 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-880/lib
-file path=usr/platform/SUNW,Sun-Fire-880/lib/sf880drd group=sys mode=0755
-dir  path=usr/platform/SUNW,Sun-Fire-V890 group=sys
-dir  path=usr/platform/SUNW,Sun-Fire-V890/lib
-link path=usr/platform/SUNW,Sun-Fire-V890/lib/sf880drd \
-    target=../../SUNW,Sun-Fire-880/lib/sf880drd
-dir  path=usr/share/man/man8
-file path=usr/share/man/man8/sf880drd.8
-legacy pkg=SUNWsfdr.u arch=$(ARCH).sun4u desc="Sun Fire 880 DR Daemon" \
-    name="Sun Fire 880 DR Daemon"
-legacy pkg=SUNWsfdrr.u arch=$(ARCH).sun4u \
-    desc="DR Daemon support for Sun Fire 880, (Root)" \
-    name="Sun Fire 880 DR Daemon service method"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.p5m b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.p5m
deleted file mode 100644
index 0477a8a1fa..0000000000
--- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.p5m
+++ /dev/null
@@ -1,40 +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.
-#
-
-#
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/system/kernel/dynamic-reconfiguration/ultra-enterprise-10000@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.p5m b/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.p5m
deleted file mode 100644
index 40b1ad61fb..0000000000
--- a/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.p5m
+++ /dev/null
@@ -1,40 +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.
-#
-
-#
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/system/kernel/inter-domain/ultra-enterprise-10000@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-kernel-io-performance-counters.p5m b/usr/src/pkg/manifests/system-kernel-io-performance-counters.p5m
deleted file mode 100644
index b40cce755f..0000000000
--- a/usr/src/pkg/manifests/system-kernel-io-performance-counters.p5m
+++ /dev/null
@@ -1,84 +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:/system/kernel/io-performance-counters@$(PKGVERS)
-set name=pkg.summary value="sun4u IO chip performance counter modules"
-set name=pkg.description value="Kernel support for IO chip performance counters"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=variant.arch value=sparc
-dir  path=platform group=sys
-dir  path=platform/SUNW,A70 group=sys
-dir  path=platform/SUNW,A70/kernel group=sys
-dir  path=platform/SUNW,A70/kernel/drv group=sys
-dir  path=platform/SUNW,A70/kernel/drv/$(ARCH64) group=sys
-file path=platform/SUNW,A70/kernel/drv/$(ARCH64)/fpc group=sys
-file path=platform/SUNW,A70/kernel/drv/fpc.conf group=sys
-dir  path=platform/SUNW,Sun-Fire-V215 group=sys
-dir  path=platform/SUNW,Sun-Fire-V215/kernel group=sys
-dir  path=platform/SUNW,Sun-Fire-V215/kernel/drv group=sys
-dir  path=platform/SUNW,Sun-Fire-V215/kernel/drv/$(ARCH64) group=sys
-link path=platform/SUNW,Sun-Fire-V215/kernel/drv/$(ARCH64)/fpc \
-    target=../../../../SUNW,A70/kernel/drv/$(ARCH64)/fpc
-link path=platform/SUNW,Sun-Fire-V215/kernel/drv/fpc.conf \
-    target=../../../SUNW,A70/kernel/drv/fpc.conf
-dir  path=platform/SUNW,Sun-Fire-V445 group=sys
-dir  path=platform/SUNW,Sun-Fire-V445/kernel group=sys
-dir  path=platform/SUNW,Sun-Fire-V445/kernel/drv group=sys
-dir  path=platform/SUNW,Sun-Fire-V445/kernel/drv/$(ARCH64) group=sys
-link path=platform/SUNW,Sun-Fire-V445/kernel/drv/$(ARCH64)/fpc \
-    target=../../../../SUNW,A70/kernel/drv/$(ARCH64)/fpc
-link path=platform/SUNW,Sun-Fire-V445/kernel/drv/fpc.conf \
-    target=../../../SUNW,A70/kernel/drv/fpc.conf
-dir  path=platform/sun4v group=sys
-dir  path=platform/sun4v/kernel group=sys
-dir  path=platform/sun4v/kernel/drv group=sys
-dir  path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/fpc group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/iospc group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/n2piupc group=sys
-file path=platform/sun4v/kernel/drv/fpc.conf group=sys
-file path=platform/sun4v/kernel/drv/iospc.conf group=sys
-file path=platform/sun4v/kernel/drv/n2piupc.conf group=sys
-driver name=fpc perms="* 0666 root sys"
-driver name=iospc perms="* 0666 root sys" \
-    alias=SUNW,ktios-pr \
-    alias=SUNW,rfios-pr
-driver name=n2piupc perms="* 0666 root sys" \
-    alias=SUNW,n2piu-pr \
-    alias=SUNW,vfpiu-pr
-legacy pkg=SUNWiopc.u arch=$(ARCH).sun4u \
-    desc="Kernel support for IO chip performance counters" \
-    name="sun4u IO chip performance counter modules"
-legacy pkg=SUNWiopc.v arch=$(ARCH).sun4v \
-    desc="Kernel support for IO chip performance counters" \
-    name="sun4v IO chip performance counter modules"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-kernel-platform-netra.p5m b/usr/src/pkg/manifests/system-kernel-platform-netra.p5m
deleted file mode 100644
index 5e548e8f0f..0000000000
--- a/usr/src/pkg/manifests/system-kernel-platform-netra.p5m
+++ /dev/null
@@ -1,36 +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.
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/system/kernel/platform/netra@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-kernel-platform.p5m b/usr/src/pkg/manifests/system-kernel-platform.p5m
index bdef3c2db8..82bed6b7f6 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.p5m
+++ b/usr/src/pkg/manifests/system-kernel-platform.p5m
@@ -41,466 +41,6 @@ set name=pkg.description \
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 dir  path=platform group=sys
-$(sparc_ONLY)dir path=platform/SUNW,A70 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,A70/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,A70/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,A70/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,A70/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,A70/kernel/drv group=sys
-$(sparc_ONLY)file path=platform/SUNW,A70/kernel/drv/ppm.conf group=sys
-$(sparc_ONLY)dir path=platform/SUNW,A70/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,A70/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,A70/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-CP3010/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/$(ARCH64) \
-    target=../../SUNW,Sun-Fire/kernel/$(ARCH64)
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/cpu \
-    target=../../SUNW,Sun-Fire/kernel/cpu
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/lw8 \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/ntwdt \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/sgcn \
-    target=../../../../SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sgcn
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/sgenv \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/sgfru \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/sgsbbc \
-    target=../../../../SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sgsbbc
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/ssm \
-    target=../../../../SUNW,Sun-Fire/kernel/drv/$(ARCH64)/ssm
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/lw8.conf group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/ntwdt.conf group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/sgenv.conf group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/sgfru.conf group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)link path=platform/SUNW,Netra-T12/kernel/misc/$(ARCH64)/sbdp \
-    target=../../../../SUNW,Sun-Fire/kernel/misc/$(ARCH64)/sbdp
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-T4/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/$(ARCH64)/lombus \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/lombus.conf group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-T4/kernel/misc/$(ARCH64)/platmod \
-    target=../../../../SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64)/platmod
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/$(ARCH64)/unix \
-    group=sys mode=0755 pkg.depend.bypass-generate=\$CPU \
-    pkg.depend.bypass-generate=dtracestubs pkg.depend.bypass-generate=genunix
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/cpu group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/cpu/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/cpu/$(ARCH64)/FJSV,SPARC64-VI \
-    group=sys mode=0755
-$(sparc_ONLY)link \
-    path=platform/SUNW,SPARC-Enterprise/kernel/cpu/$(ARCH64)/FJSV,SPARC64-VII \
-    target=FJSV,SPARC64-VI
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link \
-    path=platform/SUNW,SPARC-Enterprise/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/dr \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/mc-opl group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplmsu group=sys \
-    pkg.depend.bypass-generate=su
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplpanel group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/pcicmu group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/scfd group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/dr.conf \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/mc-opl.conf \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/oplpanel.conf \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/options.conf \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/scfd.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/drmach \
-    group=sys mode=0755 pkg.depend.bypass-generate=opl_cfg
-$(sparc_ONLY)file \
-    path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64)/grfans \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64)/grppm \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/drv/grppm.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Blade-100/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link \
-    path=platform/SUNW,Sun-Blade-1000/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalppm group=sys \
-    pkg.depend.bypass-generate=schppm
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalwd group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/xcalppm.conf \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/xcalwd.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1000/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Blade-1000/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link \
-    path=platform/SUNW,Sun-Blade-1500/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500/kernel/drv group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1500/kernel/drv/ppm.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-1500/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Blade-1500/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link \
-    path=platform/SUNW,Sun-Blade-2500/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500/kernel/drv group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-2500/kernel/drv/ppm.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-2500/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Blade-2500/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-280R/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64)/pcf8574 group=sys \
-    pkg.depend.bypass-generate=i2c_svc
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-480R/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-480R/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-880/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/drv/$(ARCH64)/hpc3130 \
-    group=sys pkg.depend.bypass-generate=i2c_svc
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/drv/hpc3130.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64)/tsalarm group=sys \
-    pkg.depend.bypass-generate=rmclomv
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-T200/kernel/drv/tsalarm.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V215/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel/drv group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V215/kernel/drv/su.conf group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-V215/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V240/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/ntwdt \
-    group=sys pkg.depend.bypass-generate=pmugpio \
-    pkg.depend.bypass-generate=rmc_comm pkg.depend.bypass-generate=rmclomv
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm group=sys \
-    pkg.depend.bypass-generate=rmclomv
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/ntwdt.conf \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/tsalarm.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-V240/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V250/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-V250/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64)/ntwdt \
-    target=../../../../SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/ntwdt
-$(sparc_ONLY)link \
-    path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64)/tsalarm \
-    target=../../../../SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/drv/ntwdt.conf \
-    target=../../../SUNW,Sun-Fire-V240/kernel/drv/ntwdt.conf
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/drv/tsalarm.conf \
-    target=../../../SUNW,Sun-Fire-V240/kernel/drv/tsalarm.conf
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-V440/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V445 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V445/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V445/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V445/kernel/crypto/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V445/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V445/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V445/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-V445/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/$(ARCH64)/unix group=sys \
-    mode=0755 pkg.depend.bypass-generate=\$CPU \
-    pkg.depend.bypass-generate=dtracestubs pkg.depend.bypass-generate=genunix
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/cpu group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64) group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \
-    group=sys mode=0755
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III+ \
-    group=sys mode=0755
-$(sparc_ONLY)link \
-    path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV \
-    target=SUNW,UltraSPARC-III+
-$(sparc_ONLY)link \
-    path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV+ \
-    target=SUNW,UltraSPARC-III+
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire/kernel/crypto/$(ARCH64)/aes \
-    target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sgcn \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sghsc \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sgsbbc \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/ssm group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/sghsc.conf group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64)/sbdp \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-250 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-250/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-250/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-250/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-250/kernel/drv/$(ARCH64)/envctrltwo \
-    group=sys pkg.depend.bypass-generate=pcipsy
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-250/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-250/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-250/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-4 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-4/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-4/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-4/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-4/kernel/drv/$(ARCH64)/envctrl \
-    group=sys pkg.depend.bypass-generate=pcipsy
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-4/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-4/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-4/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-5_10 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-5_10/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-5_10/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-5_10/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-5_10/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-80 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-80/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-80/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-80/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/SUNW,Ultra-80/kernel/misc/$(ARCH64)/platmod \
-    target=../../../../SUNW,Ultra-5_10/kernel/misc/$(ARCH64)/platmod
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/ac \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/central group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/environ group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/fhc \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/simmstat group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/sram group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/sysctrl group=sys
-$(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/fhc.conf \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Ultra-Enterprise/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/SUNW,UltraAX-i2 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,UltraAX-i2/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,UltraAX-i2/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,UltraAX-i2/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/SUNW,UltraAX-i2/kernel/misc/$(ARCH64)/platmod \
-    group=sys mode=0755
 $(i386_ONLY)dir path=platform/i86pc group=sys
 $(i386_ONLY)dir path=platform/i86pc/$(ARCH64) group=sys
 $(i386_ONLY)dir path=platform/i86pc/kernel group=sys
@@ -623,432 +163,29 @@ $(i386_ONLY)dir path=platform/i86xpv/kernel/tod group=sys
 $(i386_ONLY)dir path=platform/i86xpv/kernel/tod/$(ARCH64) group=sys
 $(i386_ONLY)file path=platform/i86xpv/kernel/tod/$(ARCH64)/xpvtod group=sys \
     mode=0755
-$(sparc_ONLY)dir path=platform/sun4u group=sys
-$(sparc_ONLY)dir path=platform/sun4u-us3 group=sys
-$(sparc_ONLY)dir path=platform/sun4u-us3/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4u-us3/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/sun4u-us3/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u-us3/kernel/crypto/$(ARCH64)/aes \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4u/bootlst group=sys reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4u/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/genunix group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/unix group=sys \
-    mode=0755 pkg.depend.bypass-generate=\$CPU \
-    pkg.depend.bypass-generate=dtracestubs
-$(sparc_ONLY)dir path=platform/sun4u/kernel/cpu group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/cpu/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-II \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \
-    group=sys mode=0755
-$(sparc_ONLY)file \
-    path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III+ group=sys \
-    mode=0755
-$(sparc_ONLY)file \
-    path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIIi group=sys \
-    mode=0755
-$(sparc_ONLY)file \
-    path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIIi+ group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIe \
-    group=sys mode=0755
-$(sparc_ONLY)link path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIi \
-    target=SUNW,UltraSPARC-II
-$(sparc_ONLY)link path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV \
-    target=SUNW,UltraSPARC-III+
-$(sparc_ONLY)link path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV+ \
-    target=SUNW,UltraSPARC-III+
-$(sparc_ONLY)dir path=platform/sun4u/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/arcfour \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/des group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/md5 group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/sha1 group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/sun4u/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/adm1026 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/adm1031 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/bbc_beep group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/db21554 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ebus group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/epic group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/fd group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/gpio_87317 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/grbeep group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ics951601 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/isadma group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/jbusppm group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/lm75 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ltc1427 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/m1535ppm group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/max1617 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/mc-us3 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/mc-us3i group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/mem_cache group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/mi2cv group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pca9556 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pcf8574 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pcf8584 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pcf8591 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pcipsy group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pcisch group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pic16f747 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pic16f819 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pmc group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pmubus group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/pmugpio group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/power group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ppm group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/px group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/rmc_comm group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/rmcadm group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/rmclomv group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/rootnex group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/sbbc group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/sbus group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/sbusmem group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/schppm group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/seeprom group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/simba group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/smbus group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/smbus_ara group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ssc050 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ssc100 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/su group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/tda8444 group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/trapstat group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/upa64s group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/zs group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/zsh group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/mem_cache.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmc_comm.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmcadm.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmclomv.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/sbusmem.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/trapstat.conf group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/zsh.conf group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/bignum group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/bootdev group=sys \
-    mode=0755
-$(sparc_ONLY)link path=platform/sun4u/kernel/misc/$(ARCH64)/des \
-    target=../../../kernel/crypto/$(ARCH64)/des
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/forthdebug \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/i2c_svc group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/kmdbmod group=sys \
-    mode=0755
-$(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/md5 \
-    target=../../../kernel/crypto/$(ARCH64)/md5
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/obpsym group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/opl_cfg group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/pcie group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/sbd group=sys \
-    mode=0755 pkg.depend.bypass-generate=sbdp
-$(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/sha1 \
-    target=../../../kernel/crypto/$(ARCH64)/sha1
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/vis group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/sun4u/kernel/tod group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/tod/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todbq4802 group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todds1287 group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todds1337 group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todm5819 group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todm5819p_rmc \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todm5823 group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todmostek group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todopl group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todsg group=sys \
-    mode=0755 pkg.depend.bypass-generate=sgsbbc
-$(sparc_ONLY)link path=platform/sun4u/kernel/unix target=$(ARCH64)/unix
-$(sparc_ONLY)dir path=platform/sun4v group=sys
-$(sparc_ONLY)file path=platform/sun4v/bootlst group=sys reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/genunix group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/unix group=sys \
-    mode=0755 pkg.depend.bypass-generate=\$CPU \
-    pkg.depend.bypass-generate=dtracestubs
-$(sparc_ONLY)dir path=platform/sun4v/kernel/cpu group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/cpu/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/cpu/$(ARCH64)/generic group=sys \
-    mode=0755
-$(sparc_ONLY)link path=platform/sun4v/kernel/cpu/$(ARCH64)/sun4v target=generic
-$(sparc_ONLY)dir path=platform/sun4v/kernel/crypto group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/crypto/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/crypto/$(ARCH64)/arcfour \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/crypto/$(ARCH64)/md5 group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/sun4v/kernel/drv group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/bge group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/bmc group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/ebus group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/glvc group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/mdesc group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/n2rng group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/ntwdt group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/px group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/qcn group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/rootnex group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/su group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/trapstat group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/vnex group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/bge.conf group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/bmc.conf group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/mdesc.conf group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/n2rng.conf group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/ntwdt.conf group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/drv/trapstat.conf group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/bootdev group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/forthdebug \
-    group=sys mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/kmdbmod group=sys \
-    mode=0755
-$(sparc_ONLY)hardlink path=platform/sun4v/kernel/misc/$(ARCH64)/md5 \
-    target=../../../kernel/crypto/$(ARCH64)/md5
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/obpsym group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/pcie group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/vis group=sys \
-    mode=0755
-$(sparc_ONLY)dir path=platform/sun4v/kernel/sys group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/sys/$(ARCH64) group=sys
-$(sparc_ONLY)link path=platform/sun4v/kernel/unix target=$(ARCH64)/unix
-$(sparc_ONLY)dir path=usr/share/man
-$(sparc_ONLY)dir path=usr/share/man/man4d
-$(sparc_ONLY)file path=usr/share/man/man4d/bbc_beep.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/dr.4d
-$(sparc_ONLY)link path=usr/share/man/man4d/drmach.4d target=dr.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/fd.4d
+dir  path=usr/share/man
+dir  path=usr/share/man/man4d
 link path=usr/share/man/man4d/fdc.4d target=fd.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/gpio_87317.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/grbeep.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/mc-opl.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/n2rng.4d
 $(i386_ONLY)file path=usr/share/man/man4d/npe.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/ntwdt.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/oplmsu.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/oplpanel.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/pcicmu.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/pcipsy.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/pcisch.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/smbus.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/su.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/todopl.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/tsalarm.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/zs.4d
-$(sparc_ONLY)file path=usr/share/man/man4d/zsh.4d
 dir  path=usr/share/man/man5
 $(i386_ONLY)link path=usr/share/man/man5/isa.5 target=sysbus.5
-$(sparc_ONLY)file path=usr/share/man/man5/sbus.5
 $(i386_ONLY)file path=usr/share/man/man5/sysbus.5
-$(sparc_ONLY)dir path=usr/share/man/man5m
-$(sparc_ONLY)driver name=ac
 $(i386_ONLY)driver name=acpinex alias=acpivirtnex
 $(i386_ONLY)driver name=acpippm
-$(sparc_ONLY)driver name=adm1026 alias=i2c-adm1026
-$(sparc_ONLY)driver name=adm1031 alias=i2c-adm1031
 $(i386_ONLY)driver name=amd_iommu perms="* 0644 root sys" \
     alias=pci1002,5a23 \
     alias=pci1022,11ff
 $(i386_ONLY)driver name=balloon perms="* 0444 root sys"
-$(sparc_ONLY)driver name=bbc_beep alias=SUNW,bbc-beep
-$(sparc_ONLY)driver name=central
 $(i386_ONLY)driver name=cpudrv alias=cpu
-$(sparc_ONLY)driver name=db21554 \
-    alias=pci108e,6300 \
-    alias=pci108e,6301 \
-    alias=pci108e,6302 \
-    alias=pci108e,6303 \
-    alias=pci108e,6310 \
-    alias=pci108e,6311 \
-    alias=pci108e,6312 \
-    alias=pci108e,6313 \
-    alias=pci108e,6320 \
-    alias=pci108e,6323 \
-    alias=pci108e,6330 \
-    alias=pci108e,6331 \
-    alias=pci108e,6332 \
-    alias=pci108e,6333 \
-    alias=pci108e,6340 \
-    alias=pci108e,6343 \
-    alias=pci108e,6350 \
-    alias=pci108e,6353 \
-    alias=pci108e,6722 \
-    alias=pciclass,060940 \
-    alias=pciclass,060980
 $(i386_ONLY)driver name=domcaps perms="* 0444 root sys"
-$(sparc_ONLY)driver name=dr
-$(sparc_ONLY)driver name=ebus class=ebus \
-    alias=SUNW,ebus \
-    alias=SUNW,sun4v-ebus \
-    alias=isa \
-    alias=jbus-ebus
-$(sparc_ONLY)driver name=envctrl alias=SUNW,envctrl
-$(sparc_ONLY)driver name=envctrltwo perms="* 0644 root sys" \
-    policy="read_priv_set=sys_config write_priv_set=sys_config" \
-    alias=SUNW,envctrltwo
-$(sparc_ONLY)driver name=environ alias=environment
-$(sparc_ONLY)driver name=epic alias=SUNW,ebus-pic18lf65j10-env
 $(i386_ONLY)driver name=evtchn perms="* 0666 root sys"
-$(sparc_ONLY)driver name=fd perms="* 0666 root sys" \
-    alias=SUNW,fdtwo \
-    alias=fdthree \
-    alias=pnpALI,1533,0
-$(sparc_ONLY)driver name=fhc
-$(sparc_ONLY)driver name=glvc
-$(sparc_ONLY)driver name=gpio_87317 perms="* 0600 root sys" alias=ns87317-gpio
-$(sparc_ONLY)driver name=grbeep alias=SUNW,smbus-beep
-$(sparc_ONLY)driver name=grfans alias=SUNW,smbus-fan-control
-$(sparc_ONLY)driver name=grppm alias=SUNW,smbus-ppm
-$(sparc_ONLY)driver name=hpc3130 perms="* 0644 root sys" \
-    alias=FJSV,hpc3130 \
-    alias=i2c-hpc3130
-$(sparc_ONLY)driver name=ics951601 alias=i2c-ics951601
 $(i386_ONLY)driver name=isa class=sysbus alias=pciclass,060100
-$(sparc_ONLY)driver name=isadma
-$(sparc_ONLY)driver name=jbusppm alias=jbus-ppm
-$(sparc_ONLY)driver name=lm75 perms="* 0644 root sys" alias=i2c-lm75
-$(sparc_ONLY)driver name=lombus perms="* 0644 root sys" alias=SUNW,lombus
-$(sparc_ONLY)driver name=ltc1427 perms="* 0644 root sys" alias=i2c-ltc1427
-$(sparc_ONLY)driver name=lw8 perms="* 0644 root sys"
-$(sparc_ONLY)driver name=m1535ppm alias=ali1535d+-ppm
-$(sparc_ONLY)driver name=max1617 alias=i2c-max1617
-$(sparc_ONLY)driver name=mc-opl alias=FJSV,oplmc
-$(sparc_ONLY)driver name=mc-us3 alias=memory-controller
-$(sparc_ONLY)driver name=mc-us3i alias=SUNW,UltraSPARC-IIIi,mc
-$(sparc_ONLY)driver name=mdesc perms="* 0666 root sys"
-$(sparc_ONLY)driver name=mem_cache
-$(sparc_ONLY)driver name=mi2cv alias=fire-i2c
-$(sparc_ONLY)driver name=n2rng \
-    alias=SUNW,kt-rng \
-    alias=SUNW,n2-rng \
-    alias=SUNW,vf-rng
 $(i386_ONLY)driver name=npe alias=pciex_root_complex
-$(sparc_ONLY)driver name=ntwdt perms="* 0644 root sys"
-$(sparc_ONLY)driver name=oplmsu alias=FJSV,oplmsu
-$(sparc_ONLY)driver name=oplpanel alias=FJSV,panel
-$(sparc_ONLY)driver name=pca9556 \
-    alias=i2c-pca9555 \
-    alias=i2c-pca9556
-$(sparc_ONLY)driver name=pcf8574 perms="* 0644 root sys" \
-    alias=i2c-pcf8574 \
-    alias=nct-PHG,pcf8574
-$(sparc_ONLY)driver name=pcf8584 \
-    alias=SUNW,bbc-i2c \
-    alias=SUNW,i2c-pic16f747 \
-    alias=nct-PHG,pcf8584
-$(sparc_ONLY)driver name=pcf8591 perms="* 0644 root sys" \
-    alias=i2c-pcf8591 \
-    alias=nct-PHG,pcf8591
 $(i386_ONLY)driver name=pci class=pci
-$(sparc_ONLY)driver name=pcicmu \
-    alias=pci10cf,138f \
-    alias=pci10cf,1390
-$(sparc_ONLY)driver name=pcipsy class=pci \
-    alias=SUNW,pci \
-    alias=pci108e,8000 \
-    alias=pci108e,a000 \
-    alias=pci108e,a001 \
-    alias=pciclass,060000
-$(sparc_ONLY)driver name=pcisch class=pci \
-    alias=pci108e,8001 \
-    alias=pci108e,8002 \
-    alias=pci108e,a801
-$(sparc_ONLY)driver name=pic16f747 alias=SUNW,ebus-pic16f747-env
-$(sparc_ONLY)driver name=pic16f819 alias=SUNW,i2c-auxfan1
 $(i386_ONLY)driver name=pit_beep alias=SUNW,pit_beep
-$(sparc_ONLY)driver name=pmc alias=SUNW,pmc
-$(sparc_ONLY)driver name=pmubus alias=pmu
-$(sparc_ONLY)driver name=pmugpio
 driver name=ppm
 $(i386_ONLY)driver name=privcmd perms="* 0666 root sys"
-$(sparc_ONLY)driver name=px \
-    alias=SUNW,sun4v-pci \
-    alias=pciex108e,80f0 \
-    alias=pciex108e,80f8
-$(sparc_ONLY)driver name=qcn alias=SUNW,sun4v-console
-$(sparc_ONLY)driver name=rmc_comm
-$(sparc_ONLY)driver name=rmcadm
-$(sparc_ONLY)driver name=rmclomv
-$(sparc_ONLY)driver name=rootnex \
-    alias=cpu-unit \
-    alias=io-unit \
-    alias=mem-unit
 $(i386_ONLY)driver name=rootnex
-$(sparc_ONLY)driver name=sbbc alias=pci108e,c416
-$(sparc_ONLY)driver name=sbus class=sbus
-$(sparc_ONLY)driver name=sbusmem
-$(sparc_ONLY)driver name=scfd alias=FJSV,scfc
-$(sparc_ONLY)driver name=schppm alias=gp2-ppm
-$(sparc_ONLY)driver name=seeprom \
-    alias=i2c-at24c64 \
-    alias=i2c-at34c02
-$(sparc_ONLY)driver name=sgcn
-$(sparc_ONLY)driver name=sgenv
-$(sparc_ONLY)driver name=sgfru
-$(sparc_ONLY)driver name=sghsc
-$(sparc_ONLY)driver name=sgsbbc
-$(sparc_ONLY)driver name=simba class=pci alias=pci108e,5000
-$(sparc_ONLY)driver name=simmstat alias=simm-status
-$(sparc_ONLY)driver name=smbus alias=i2c-smbus
-$(sparc_ONLY)driver name=smbus_ara alias=i2c-smbus-ara
-$(sparc_ONLY)driver name=sram
-$(sparc_ONLY)driver name=ssc050 perms="* 0644 root sys" alias=i2c-ssc050
-$(sparc_ONLY)driver name=ssc100 perms="* 0644 root sys" alias=i2c-ssc100
-$(sparc_ONLY)driver name=ssm perms="* 0640 root sys"
-$(sparc_ONLY)driver name=su perms="[a-z] 0666 root sys" \
-    perms="[a-z],cu 0600 uucp uucp" perms="ssp 0600 root sys" \
-    perms="sspctl 0600 root sys"
-$(sparc_ONLY)driver name=sysctrl alias=clock-board
-$(sparc_ONLY)driver name=tda8444 alias=i2c-tda8444
-$(sparc_ONLY)driver name=tod perms="* 0600 root sys"
-$(sparc_ONLY)driver name=todds1287 alias=ds1287
-$(sparc_ONLY)driver name=todds1307
-$(sparc_ONLY)driver name=todds1337 alias=i2c-ds1337
-$(sparc_ONLY)driver name=trapstat perms="* 0600 root sys"
-$(sparc_ONLY)driver name=tsalarm
-$(sparc_ONLY)driver name=upa64s \
-    alias=SUNW,upa64s \
-    alias=jbus-upa64s
-$(sparc_ONLY)driver name=vnex \
-    alias=SUNW,sun4v-virtual-devices \
-    alias=SUNW,virtual-devices
-$(sparc_ONLY)driver name=xcalppm alias=ebus-ppm
-$(sparc_ONLY)driver name=xcalwd
 $(i386_ONLY)driver name=xdb
 $(i386_ONLY)driver name=xdf
 $(i386_ONLY)driver name=xenbus perms="* 0666 root sys"
@@ -1061,21 +198,9 @@ $(i386_ONLY)driver name=xnbu alias=xnb,netfront
 $(i386_ONLY)driver name=xnf
 $(i386_ONLY)driver name=xpvd
 $(i386_ONLY)driver name=xpvtap perms="* 0666 root sys"
-$(sparc_ONLY)driver name=zs perms="[a-z] 0666 root sys" \
-    perms="[a-z],cu 0600 uucp uucp"
-$(sparc_ONLY)driver name=zsh perms="* 0666 root sys"
 $(i386_ONLY)legacy pkg=SUNWcakr.i arch=$(ARCH).i86pc \
     desc="core kernel software for a specific hardware platform group" \
     name="Core Solaris Kernel Architecture (Root)"
-$(sparc_ONLY)legacy pkg=SUNWcakr.u arch=$(ARCH).sun4u \
-    desc="core kernel software for a specific hardware platform group" \
-    name="Core Solaris Kernel Architecture (Root)"
-$(sparc_ONLY)legacy pkg=SUNWcakr.v arch=$(ARCH).sun4v \
-    desc="core kernel software for a specific hardware platform group" \
-    name="Core Solaris Kernel Architecture (Root)"
-$(sparc_ONLY)legacy pkg=SUNWcakrnt2000.v arch=$(ARCH).sun4v \
-    desc="driver software for the Netra-T2000 hardware platform" \
-    name="Platform Specific Drivers for Netra-T2000, (Root)"
 $(i386_ONLY)legacy pkg=SUNWcakrx.i arch=$(ARCH).i86pc \
     desc="core kernel software for the i86xpv virtual hardware platform" \
     name="Core Kernel Architecture i86xpv, (Root)"
@@ -1086,8 +211,6 @@ license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \
 license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE
 license usr/src/contrib/zlib/THIRDPARTYLICENSE \
     license=usr/src/contrib/zlib/THIRDPARTYLICENSE
-$(sparc_ONLY)license usr/src/stand/lib/tcp/THIRDPARTYLICENSE \
-    license=usr/src/stand/lib/tcp/THIRDPARTYLICENSE
 license usr/src/uts/common/krtld/THIRDPARTYLICENSE.bootrd_cpio \
     license=usr/src/uts/common/krtld/THIRDPARTYLICENSE.bootrd_cpio
 license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \
diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m b/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
index 5469230ad8..ab7ba526a0 100644
--- a/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
+++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.p5m
@@ -46,24 +46,11 @@ $(i386_ONLY)dir path=platform/i86pc/kernel/misc group=sys
 $(i386_ONLY)dir path=platform/i86pc/kernel/misc/$(ARCH64) group=sys
 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/cpr group=sys \
     mode=0755
-$(sparc_ONLY)dir path=platform/sun4u group=sys
-$(sparc_ONLY)file path=platform/sun4u/cprboot group=sys reboot-needed=true
-$(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)file path=platform/sun4u/kernel/drv/$(ARCH64)/tod group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/tod.conf group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/cpr group=sys \
-    mode=0755
 dir  path=usr/share/man
 dir  path=usr/share/man/man4
 file path=usr/share/man/man4/cpr.4
 $(i386_ONLY)driver name=srn
 $(i386_ONLY)legacy pkg=SUNWcpr.i arch=$(ARCH).i86pc \
     desc="Suspend, Resume package" name="Suspend, Resume package"
-$(sparc_ONLY)legacy pkg=SUNWcpr.u arch=$(ARCH).sun4u \
-    desc="Suspend, Resume package" name="Suspend, Resume package"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-kernel.p5m b/usr/src/pkg/manifests/system-kernel.p5m
index 4ab8a619b7..7aab0aefde 100644
--- a/usr/src/pkg/manifests/system-kernel.p5m
+++ b/usr/src/pkg/manifests/system-kernel.p5m
@@ -108,7 +108,6 @@ file path=kernel/crypto/$(ARCH64)/skein group=sys mode=0755
 file path=kernel/crypto/$(ARCH64)/swrand group=sys mode=0755
 dir  path=kernel/dacf group=sys
 dir  path=kernel/dacf/$(ARCH64) group=sys
-$(sparc_ONLY)file path=kernel/dacf/$(ARCH64)/consconfig_dacf group=sys mode=0755
 file path=kernel/dacf/$(ARCH64)/net_dacf group=sys mode=0755
 dir  path=kernel/drv group=sys
 dir  path=kernel/drv/$(ARCH64) group=sys
@@ -126,7 +125,6 @@ file path=kernel/drv/$(ARCH64)/cpuid group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/cpunex group=sys
 file path=kernel/drv/$(ARCH64)/crypto group=sys
 file path=kernel/drv/$(ARCH64)/cryptoadm group=sys
-$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/dad group=sys
 file path=kernel/drv/$(ARCH64)/devinfo group=sys
 file path=kernel/drv/$(ARCH64)/dld group=sys
 file path=kernel/drv/$(ARCH64)/dlpistub group=sys
@@ -159,7 +157,6 @@ file path=kernel/drv/$(ARCH64)/openeepr group=sys
 file path=kernel/drv/$(ARCH64)/options group=sys
 file path=kernel/drv/$(ARCH64)/pci_pci group=sys
 file path=kernel/drv/$(ARCH64)/pcieb group=sys
-$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/pcieb_bcm group=sys
 file path=kernel/drv/$(ARCH64)/physmem group=sys
 file path=kernel/drv/$(ARCH64)/poll group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/power group=sys
@@ -185,7 +182,6 @@ file path=kernel/drv/$(ARCH64)/tcp group=sys
 file path=kernel/drv/$(ARCH64)/tcp6 group=sys
 file path=kernel/drv/$(ARCH64)/tl group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/tzmon group=sys
-$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/uata group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/ucode group=sys
 file path=kernel/drv/$(ARCH64)/udp group=sys
 file path=kernel/drv/$(ARCH64)/udp6 group=sys
@@ -205,7 +201,6 @@ file path=kernel/drv/consms.conf group=sys
 file path=kernel/drv/cpuid.conf group=sys
 file path=kernel/drv/crypto.conf group=sys
 file path=kernel/drv/cryptoadm.conf group=sys
-$(sparc_ONLY)file path=kernel/drv/dad.conf group=sys
 file path=kernel/drv/devinfo.conf group=sys
 file path=kernel/drv/dld.conf group=sys
 file path=kernel/drv/dlpistub.conf group=sys
@@ -247,8 +242,6 @@ file path=kernel/drv/rts.conf group=sys
 file path=kernel/drv/sad.conf group=sys
 file path=kernel/drv/scsi_vhci.conf group=sys \
     original_name=SUNWckr:kernel/drv/scsi_vhci.conf preserve=true
-$(sparc_ONLY)file path=kernel/drv/sd.conf group=sys \
-    original_name=SUNWckr:kernel/drv/sd.conf preserve=true
 $(i386_ONLY)file path=kernel/drv/sd.conf group=sys \
     original_name=SUNWos86r:kernel/drv/sd.conf preserve=true
 file path=kernel/drv/sgen.conf group=sys \
@@ -266,8 +259,6 @@ file path=kernel/drv/tcp.conf group=sys
 file path=kernel/drv/tcp6.conf group=sys
 file path=kernel/drv/tl.conf group=sys
 $(i386_ONLY)file path=kernel/drv/tzmon.conf group=sys
-$(sparc_ONLY)file path=kernel/drv/uata.conf group=sys \
-    original_name=SUNWckr:kernel/drv/uata.conf preserve=true
 $(i386_ONLY)file path=kernel/drv/ucode.conf group=sys
 file path=kernel/drv/udp.conf group=sys
 file path=kernel/drv/udp6.conf group=sys
@@ -328,7 +319,6 @@ file path=kernel/misc/$(ARCH64)/cc group=sys mode=0755
 file path=kernel/misc/$(ARCH64)/cmlb group=sys mode=0755
 file path=kernel/misc/$(ARCH64)/consconfig group=sys mode=0755
 file path=kernel/misc/$(ARCH64)/ctf group=sys mode=0755
-$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/dada group=sys mode=0755
 link path=kernel/misc/$(ARCH64)/des target=../../../kernel/crypto/$(ARCH64)/des
 file path=kernel/misc/$(ARCH64)/dls group=sys mode=0755
 # Sadly vuid mouse support is in different packages on different platforms
@@ -367,7 +357,6 @@ hardlink path=kernel/misc/$(ARCH64)/sha2 \
 hardlink path=kernel/misc/$(ARCH64)/skein \
     target=../../../kernel/crypto/$(ARCH64)/skein
 file path=kernel/misc/$(ARCH64)/strplumb group=sys mode=0755
-$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/swapgeneric group=sys mode=0755
 file path=kernel/misc/$(ARCH64)/tem group=sys mode=0755
 file path=kernel/misc/$(ARCH64)/tlimod group=sys mode=0755
 dir  path=kernel/misc/scsi_vhci group=sys
@@ -420,7 +409,6 @@ hardlink path=kernel/strmod/$(ARCH64)/ipsecesp \
 hardlink path=kernel/strmod/$(ARCH64)/keysock \
     target=../../../kernel/drv/$(ARCH64)/keysock
 file path=kernel/strmod/$(ARCH64)/ldterm group=sys mode=0755
-$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/ms group=sys mode=0755
 file path=kernel/strmod/$(ARCH64)/pckt group=sys mode=0755
 file path=kernel/strmod/$(ARCH64)/pfmod group=sys mode=0755
 file path=kernel/strmod/$(ARCH64)/pipemod group=sys mode=0755
@@ -434,7 +422,6 @@ file path=kernel/strmod/$(ARCH64)/tirdwr group=sys mode=0755
 file path=kernel/strmod/$(ARCH64)/ttcompat group=sys mode=0755
 hardlink path=kernel/strmod/$(ARCH64)/udp \
     target=../../../kernel/drv/$(ARCH64)/udp
-$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755
 dir  path=kernel/sys group=sys
 dir  path=kernel/sys/$(ARCH64) group=sys
 hardlink path=kernel/sys/$(ARCH64)/autofs \
@@ -472,15 +459,12 @@ dir  path=usr/share/man/man2
 dir  path=usr/share/man/man3
 dir  path=usr/share/man/man4
 dir  path=usr/share/man/man4d
-$(sparc_ONLY)file path=usr/share/man/man4d/dad.4d
 $(i386_ONLY)file path=usr/share/man/man4d/smbios.4d
 dir  path=usr/share/man/man4fs
 dir  path=usr/share/man/man4m
 dir  path=usr/share/man/man4p
 dir  path=usr/share/man/man5
 dir  path=usr/share/man/man8
-$(sparc_ONLY)file path=usr/share/man/man8/monitor.8
-$(sparc_ONLY)file path=usr/share/man/man8/obpsym.8
 dir  path=usr/share/man/man9
 dir  path=usr/share/man/man9e
 dir  path=usr/share/man/man9f
@@ -500,12 +484,10 @@ driver name=cpuid perms="self 0644 root sys"
 $(i386_ONLY)driver name=cpunex alias=cpus
 driver name=crypto perms="crypto 0666 root sys"
 driver name=cryptoadm perms="cryptoadm 0644 root sys"
-$(sparc_ONLY)driver name=dad perms="* 0640 root sys" alias=ide-disk
 driver name=devinfo perms="devinfo 0640 root sys" \
     perms="devinfo,ro 0444 root sys"
 driver name=dld perms="* 0666 root sys"
 driver name=dlpistub perms="* 0666 root sys"
-$(sparc_ONLY)driver name=i8042 alias=8042
 $(i386_ONLY)driver name=i8042
 driver name=icmp perms="icmp 0666 root sys" \
     policy="read_priv_set=net_icmpaccess write_priv_set=net_icmpaccess"
@@ -571,56 +553,28 @@ driver name=nulldriver \
     alias=scsa,probe
 driver name=openeepr perms="openprom 0640 root sys" policy=write_priv_set=all
 driver name=options
-$(sparc_ONLY)driver name=pci_pci class=pci \
-    alias=pci1011,1 \
-    alias=pci1011,21 \
-    alias=pci1011,24 \
-    alias=pci1011,25 \
-    alias=pci1011,26 \
-    alias=pci1014,22 \
-    alias=pciclass,060400
 $(i386_ONLY)driver name=pci_pci class=pci \
     alias=pci1011,1 \
     alias=pci1011,21 \
     alias=pci1014,22 \
     alias=pciclass,060400 \
     alias=pciclass,060401
-$(sparc_ONLY)driver name=pcieb \
-    alias=pciex108e,9010 \
-    alias=pciex108e,9020 \
-    alias=pciex10b5,8114 \
-    alias=pciex10b5,8516 \
-    alias=pciex10b5,8517 \
-    alias=pciex10b5,8518 \
-    alias=pciex10b5,8532 \
-    alias=pciex10b5,8533 \
-    alias=pciex10b5,8548 \
-    alias=pciexclass,060400
 $(i386_ONLY)driver name=pcieb \
     alias=pciexclass,060400 \
     alias=pciexclass,060401
-$(sparc_ONLY)driver name=pcieb_bcm alias=pciex1166,103
 driver name=physmem perms="* 0600 root sys"
 driver name=poll perms="* 0666 root sys"
-$(sparc_ONLY)driver name=power alias=ali1535d+-power
 $(i386_ONLY)driver name=power
 driver name=pseudo alias=zconsnex
 driver name=ptc perms="* 0666 root sys"
 driver name=ptsl perms="* 0666 root sys"
-$(sparc_ONLY)driver name=ramdisk perms="* 0600 root sys" \
-    perms="ctl 0644 root sys" alias=SUNW,ramdisk
-$(i386_ONLY)driver name=ramdisk perms="* 0600 root sys" \
-    perms="ctl 0644 root sys"
+driver name=ramdisk perms="* 0600 root sys" perms="ctl 0644 root sys"
 driver name=random perms="* 0644 root sys" policy=write_priv_set=sys_devices
 driver name=rts perms="rts 0666 root sys"
 driver name=sad perms="admin 0666 root sys" perms="user 0666 root sys"
 driver name=scsi_vhci perms="* 0666 root sys" class=scsi-self-identifying \
     policy="devctl write_priv_set=sys_devices"
-$(sparc_ONLY)driver name=sd perms="* 0640 root sys" \
-    alias=ide-cdrom \
-    alias=scsiclass,00 \
-    alias=scsiclass,05
-$(i386_ONLY)driver name=sd perms="* 0640 root sys" \
+driver name=sd perms="* 0640 root sys" \
     alias=scsiclass,00 \
     alias=scsiclass,05
 driver name=sgen perms="* 0600 root sys" \
@@ -641,12 +595,6 @@ driver name=tcp6 perms="tcp6 0666 root sys"
 driver name=tl perms="* 0666 root sys" clone_perms="ticlts 0666 root sys" \
     clone_perms="ticots 0666 root sys" clone_perms="ticotsord 0666 root sys"
 $(i386_ONLY)driver name=tzmon
-$(sparc_ONLY)driver name=uata \
-    alias=pci1095,646 \
-    alias=pci1095,649 \
-    alias=pci1095,680 \
-    alias=pci10b9,5229 \
-    alias=pci10b9,5288 class=dada class=scsi
 $(i386_ONLY)driver name=ucode perms="* 0644 root sys"
 driver name=udp perms="udp 0666 root sys"
 driver name=udp6 perms="udp6 0666 root sys"
diff --git a/usr/src/pkg/manifests/system-ldoms.p5m b/usr/src/pkg/manifests/system-ldoms.p5m
deleted file mode 100644
index ff5baafb62..0000000000
--- a/usr/src/pkg/manifests/system-ldoms.p5m
+++ /dev/null
@@ -1,116 +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:/system/ldoms@$(PKGVERS)
-set name=pkg.summary value="Solaris Logical Domains"
-set name=pkg.description value="Solaris Logical Domains Configuration Files"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=variant.arch value=sparc
-dir  path=lib
-dir  path=lib/svc
-dir  path=lib/svc/manifest group=sys
-dir  path=lib/svc/manifest/platform group=sys
-dir  path=lib/svc/manifest/platform/sun4v group=sys
-file path=lib/svc/manifest/platform/sun4v/drd.xml group=sys mode=0444
-file path=lib/svc/manifest/platform/sun4v/ldoms-agents.xml group=sys mode=0444
-file path=lib/svc/manifest/platform/sun4v/vntsd.xml group=sys mode=0444
-dir  path=lib/svc/method
-file path=lib/svc/method/ldoms-agents mode=0555
-file path=lib/svc/method/svc-drd mode=0555
-file path=lib/svc/method/svc-vntsd mode=0555
-dir  path=platform group=sys
-dir  path=platform/sun4v group=sys
-dir  path=platform/sun4v/kernel group=sys
-dir  path=platform/sun4v/kernel/drv group=sys
-dir  path=platform/sun4v/kernel/drv/$(ARCH64) group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/cnex group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/drctl group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/ds_pri group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/ds_snmp group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vcc group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vdc group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vds group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vldc group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vlds group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vnet group=sys
-file path=platform/sun4v/kernel/drv/$(ARCH64)/vsw group=sys
-file path=platform/sun4v/kernel/drv/drctl.conf group=sys
-file path=platform/sun4v/kernel/drv/ds_pri.conf group=sys
-file path=platform/sun4v/kernel/drv/ds_snmp.conf group=sys
-dir  path=platform/sun4v/kernel/misc group=sys
-dir  path=platform/sun4v/kernel/misc/$(ARCH64) group=sys
-file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_cpu group=sys mode=0755
-file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_io group=sys mode=0755
-file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_mem group=sys mode=0755
-file path=platform/sun4v/kernel/misc/$(ARCH64)/ds group=sys mode=0755
-file path=platform/sun4v/kernel/misc/$(ARCH64)/fault_iso group=sys mode=0755
-file path=platform/sun4v/kernel/misc/$(ARCH64)/ldc group=sys mode=0755
-file path=platform/sun4v/kernel/misc/$(ARCH64)/platsvc group=sys mode=0755
-dir  path=usr group=sys
-dir  path=usr/lib
-dir  path=usr/lib/$(ARCH64)
-file path=usr/lib/$(ARCH64)/libds.so.1
-file path=usr/lib/$(ARCH64)/libpri.so.1
-dir  path=usr/lib/ldoms
-file path=usr/lib/ldoms/drd mode=0555
-file path=usr/lib/ldoms/ldmad mode=0555
-file path=usr/lib/ldoms/vntsd mode=0555
-file path=usr/lib/libds.so.1
-file path=usr/lib/libpri.so.1
-dir  path=usr/lib/rcm
-dir  path=usr/lib/rcm/scripts
-file path=usr/lib/rcm/scripts/SUNW,vdevices.pl mode=0555
-dir  path=usr/share/man/man8
-file path=usr/share/man/man8/drd.8
-file path=usr/share/man/man8/ldmad.8
-file path=usr/share/man/man8/vntsd.8
-driver name=cnex alias=SUNW,sun4v-channel-devices
-driver name=drctl
-driver name=ds_pri
-driver name=ds_snmp
-driver name=vcc alias=SUNW,sun4v-console-concentrator
-driver name=vdc alias=SUNW,sun4v-disk
-driver name=vds alias=SUNW,sun4v-disk-server
-driver name=vldc alias=SUNW,sun4v-channel
-driver name=vlds alias=SUNW,sun4v-domain-service
-driver name=vnet perms="* 0666 root sys" clone_perms="vnet 0666 root sys" \
-    alias=SUNW,sun4v-network
-driver name=vsw perms="* 0666 root sys" clone_perms="vsw 0666 root sys" \
-    alias=SUNW,sun4v-network-switch
-legacy pkg=SUNWldomr.v arch=$(ARCH).sun4v \
-    desc="Solaris Logical Domains Configuration Files" \
-    name="Solaris Logical Domains (Root)"
-legacy pkg=SUNWldomu.v arch=$(ARCH).sun4v \
-    desc="Solaris Logical Domains Configuration and Administration" \
-    name="Solaris Logical Domains (Usr)"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-library-math.p5m b/usr/src/pkg/manifests/system-library-math.p5m
index 255cf89a61..cd55cba0b1 100644
--- a/usr/src/pkg/manifests/system-library-math.p5m
+++ b/usr/src/pkg/manifests/system-library-math.p5m
@@ -30,16 +30,6 @@ file path=lib/$(ARCH64)/libm.so.1
 file path=lib/$(ARCH64)/libm.so.2
 link path=lib/$(ARCH64)/libmvec.so target=libmvec.so.1
 file path=lib/$(ARCH64)/libmvec.so.1
-$(sparc_ONLY)dir path=lib/cpu
-$(sparc_ONLY)dir path=lib/cpu/sparcv8plus+vis
-$(sparc_ONLY)file path=lib/cpu/sparcv8plus+vis/libmvec_isa.so.1
-$(sparc_ONLY)dir path=lib/cpu/sparcv9+vis
-$(sparc_ONLY)dir path=lib/cpu/sparcv9+vis/$(ARCH64)
-$(sparc_ONLY)file path=lib/cpu/sparcv9+vis/$(ARCH64)/libmvec_isa.so.1
-$(sparc_ONLY)dir path=lib/cpu/sparcv9+vis2
-$(sparc_ONLY)dir path=lib/cpu/sparcv9+vis2/$(ARCH64)
-$(sparc_ONLY)file path=lib/cpu/sparcv9+vis2/$(ARCH64)/libmvec_isa.so.1
-$(sparc_ONLY)file path=lib/cpu/sparcv9+vis2/libmvec_isa.so.1
 link path=lib/libm.so target=libm.so.2
 file path=lib/libm.so.1
 file path=lib/libm.so.2
diff --git a/usr/src/pkg/manifests/system-library-platform.p5m b/usr/src/pkg/manifests/system-library-platform.p5m
index 9e05b15766..315206111e 100644
--- a/usr/src/pkg/manifests/system-library-platform.p5m
+++ b/usr/src/pkg/manifests/system-library-platform.p5m
@@ -32,453 +32,8 @@ set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/platform group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/fs target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,A70/sbin target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-210 target=SUNW,Sun-Fire-V240
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-240 target=SUNW,Sun-Fire-V240
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-440 target=SUNW,Sun-Fire-V440
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP3010/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP3060/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3060/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/sbin/prtdiag \
-    target=../../sun4v/sbin/prtdiag
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP3260/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3260/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/sbin/prtdiag \
-    target=../../sun4v/sbin/prtdiag
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T12/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T12/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T12/sbin target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T2000 target=SUNW,Sun-Fire-T200
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T4/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T4/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T4/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/include \
-    target=../sun4v/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5220/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libtsalarm.so \
-    target=../../sun4v/lib/libtsalarm.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libtsalarm.so.1 \
-    target=../../sun4v/lib/libtsalarm.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/sbin target=../sun4v/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440 group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/include \
-    target=../sun4v/include
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T5440/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libtsalarm.so \
-    target=../../sun4v/lib/libtsalarm.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libtsalarm.so.1 \
-    target=../../sun4v/lib/libtsalarm.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/sbin target=../sun4v/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise group=sys
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T1000 \
-    target=SUNW,Sun-Fire-T200
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T2000 \
-    target=SUNW,Sun-Fire-T200
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5120/sbin \
-    target=../sun4v/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5220 \
-    target=SUNW,SPARC-Enterprise-T5120
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm/$(ARCH64)/scsi.so \
-    target=./scsi.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm/$(ARCH64)/scsi.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm/scsi.so \
-    target=./scsi.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm/scsi.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1000/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1000/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1000/sbin \
-    target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1500/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1500/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1500/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1500/sbin \
-    target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-2500/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-2500/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-2500/sbin \
-    target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6300/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Sun-Blade-T6300/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Fire-T200/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/sbin \
-    target=../sun4v/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-T6320/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6320/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6320/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6320/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6320/sbin \
-    target=../sun4v/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6340 target=SUNW,T5140
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-280R/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/sbin target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T1000 \
-    target=SUNW,Sun-Fire-T200
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-T200/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-T200/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/sbin target=../sun4v/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V210 target=SUNW,Sun-Fire-V240
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/librsc.so \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/librsc.so.1 \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/sbin/scadm \
-    target=../../SUNW,Sun-Fire-V240/sbin/scadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/lib/librsc.so \
-    target=./librsc.so.1
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V240/lib/librsc.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V240/sbin/scadm group=sys \
-    mode=2755
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V245 target=SUNW,Sun-Fire-V215
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/librsc.so \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/librsc.so.1 \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/sbin/scadm \
-    target=../../SUNW,Sun-Fire-V240/sbin/scadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/librsc.so \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/librsc.so.1 \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/sbin \
-    target=../SUNW,Sun-Fire-V240/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/librsc.so \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/librsc.so.1 \
-    target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/sbin/scadm \
-    target=../../SUNW,Sun-Fire-V240/sbin/scadm
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Fire-480R/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Sun-Fire-880/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,T5140/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fs target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,T5140/sbin target=../sun4v/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,T5240 target=SUNW,T5140
-$(sparc_ONLY)link path=usr/platform/SUNW,T5440 target=SUNW,T5140
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,USBRDT-5240/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/fs \
-    target=../../sun4v/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/libpcp.so \
-    target=../../sun4v/lib/libpcp.so
-$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/libpcp.so.1 \
-    target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/sbin target=../sun4v/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-2 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-2/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Ultra-2/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/sbin target=../sun4u/sbin
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-250 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-250/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-250/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-250/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Ultra-250/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-250/sbin target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-30 target=SUNW,Ultra-2
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-4 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-4/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)file path=usr/platform/SUNW,Ultra-4/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/sbin target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-5_10 target=SUNW,Ultra-2
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-60 target=SUNW,Ultra-2
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-80 target=SUNW,Ultra-2
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise/lib
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/sbin \
-    target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraAX-i2 target=sun4u
 $(i386_ONLY)dir path=usr/platform/i86pc group=sys
 $(i386_ONLY)dir path=usr/platform/i86pc/lib
-$(sparc_ONLY)dir path=usr/platform/sun4u group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u-opl group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u-opl/lib
-$(sparc_ONLY)dir path=usr/platform/sun4u-us3 group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u-us3/lib
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/cfgadm
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/ac.so \
-    target=./ac.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/ac.so.1
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sbd.so \
-    target=./sbd.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sbd.so.1
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sysctrl.so \
-    target=./sysctrl.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sysctrl.so.1
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/ac.so target=./ac.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/ac.so.1
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/sbd.so target=./sbd.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/sbd.so.1
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/sysctrl.so \
-    target=./sysctrl.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/sysctrl.so.1
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fs
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fs/cpio
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/fs/cpio/bootblk \
-    target=../../../../../../platform/sun4u/lib/fs/cpio/bootblk
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fs/hsfs
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/fs/hsfs/bootblk \
-    target=../../../../../../platform/sun4u/lib/fs/hsfs/bootblk
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fs/nfs
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/fs/nfs/inetboot group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fs/ufs
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/fs/ufs/bootblk \
-    target=../../../../../../platform/sun4u/lib/fs/ufs/bootblk
-$(sparc_ONLY)dir path=usr/platform/sun4u/lib/fs/zfs
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/fs/zfs/bootblk \
-    target=../../../../../../platform/sun4u/lib/fs/zfs/bootblk
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/libprtdiag.so \
-    target=./libprtdiag.so.1
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/libprtdiag.so.1
-$(sparc_ONLY)link path=usr/platform/sun4u/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,Ultra-2/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)dir path=usr/platform/sun4u/sbin
-$(sparc_ONLY)file path=usr/platform/sun4u/sbin/prtdiag group=sys mode=2755
-$(sparc_ONLY)dir path=usr/platform/sun4v group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/include
-$(sparc_ONLY)file path=usr/platform/sun4v/include/tsalarm.h
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fs
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fs/cpio
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/fs/cpio/bootblk \
-    target=../../../../../../platform/sun4v/lib/fs/cpio/bootblk
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fs/hsfs
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/fs/hsfs/bootblk \
-    target=../../../../../../platform/sun4v/lib/fs/hsfs/bootblk
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fs/nfs
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/fs/nfs/inetboot group=sys
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fs/ufs
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/fs/ufs/bootblk \
-    target=../../../../../../platform/sun4v/lib/fs/ufs/bootblk
-$(sparc_ONLY)dir path=usr/platform/sun4v/lib/fs/zfs
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/fs/zfs/bootblk \
-    target=../../../../../../platform/sun4v/lib/fs/zfs/bootblk
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/libpcp.so target=./libpcp.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/libprtdiag.so \
-    target=./libprtdiag.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/libprtdiag.so.1
-$(sparc_ONLY)link path=usr/platform/sun4v/lib/libtsalarm.so \
-    target=./libtsalarm.so.1
-$(sparc_ONLY)file path=usr/platform/sun4v/lib/libtsalarm.so.1
-$(sparc_ONLY)dir path=usr/platform/sun4v/sbin
-$(sparc_ONLY)file path=usr/platform/sun4v/sbin/device_remap mode=0544
-$(sparc_ONLY)file path=usr/platform/sun4v/sbin/prtdiag group=sys mode=2755
 dir  path=usr/share/man/man3lib
 file path=usr/share/man/man3lib/libtsalarm.3lib
 dir  path=usr/share/man/man8
@@ -487,16 +42,5 @@ file path=usr/share/man/man8/scadm.8
 $(i386_ONLY)legacy pkg=SUNWkvm.i arch=$(ARCH).i86pc \
     desc="core software for a specific hardware platform group" \
     name="Core Architecture, (Kvm)"
-$(sparc_ONLY)legacy pkg=SUNWkvm.u arch=$(ARCH).sun4u \
-    desc="core software for a specific hardware platform group" \
-    name="Core Architecture, (Kvm)"
-$(sparc_ONLY)legacy pkg=SUNWkvm.v arch=$(ARCH).sun4v \
-    desc="core software for a specific hardware platform group" \
-    name="Core Architecture, (Kvm)"
-$(sparc_ONLY)legacy pkg=SUNWkvmt200.v arch=$(ARCH).sun4v \
-    desc="core software for a specific hardware platform group" \
-    name="Core Architecture, sun4v-based platforms (Kvm)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(sparc_ONLY)license usr/src/stand/lib/tcp/THIRDPARTYLICENSE \
-    license=usr/src/stand/lib/tcp/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/system-library-processor.p5m b/usr/src/pkg/manifests/system-library-processor.p5m
index 291df2b28e..57d5936d1c 100644
--- a/usr/src/pkg/manifests/system-library-processor.p5m
+++ b/usr/src/pkg/manifests/system-library-processor.p5m
@@ -29,115 +29,12 @@ set name=pkg.description \
     value="core software for a specific hardware platform group"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
-$(sparc_ONLY)dir path=etc group=sys
-$(sparc_ONLY)dir path=etc/flash group=sys
-$(sparc_ONLY)dir path=etc/flash/postdeployment group=sys
-$(sparc_ONLY)file path=etc/flash/postdeployment/ttydefs.cleanup group=sys \
-    mode=0744
 dir  path=platform group=sys
-$(sparc_ONLY)link path=platform/SUNW,Netra-210 target=SUNW,Sun-Fire-V240
-$(sparc_ONLY)link path=platform/SUNW,Netra-240 target=SUNW,Sun-Fire-V240
-$(sparc_ONLY)link path=platform/SUNW,Netra-440 target=SUNW,Sun-Fire-V440
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Netra-CP3060/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)link path=platform/SUNW,Netra-CP3060/lib target=../sun4v/lib
-$(sparc_ONLY)link path=platform/SUNW,Netra-CP3260 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,Netra-T2000 target=SUNW,Sun-Fire-T200
-$(sparc_ONLY)link path=platform/SUNW,Netra-T5220 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,Netra-T5440 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,SPARC-Enterprise-T1000 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,SPARC-Enterprise-T2000 \
-    target=SUNW,Sun-Fire-T200
-$(sparc_ONLY)link path=platform/SUNW,SPARC-Enterprise-T5120 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,SPARC-Enterprise-T5220 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-T6300 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-T6320 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-T6340 target=sun4v
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-480R group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880 group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-T1000 target=sun4v
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)file \
-    path=platform/SUNW,Sun-Fire-T200/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-T200/lib target=../sun4v/lib
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V210 target=SUNW,Sun-Fire-V240
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240 group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V245 target=SUNW,Sun-Fire-V215
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V250 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440 group=sys
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V490 target=SUNW,Sun-Fire-480R
-$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V890 target=SUNW,Sun-Fire-880
-$(sparc_ONLY)link path=platform/SUNW,T5140 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,T5240 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,T5440 target=sun4v
-$(sparc_ONLY)link path=platform/SUNW,USBRDT-5240 target=sun4v
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-2 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-30 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Ultra-60 group=sys
 $(i386_ONLY)dir path=platform/i86pc group=sys
 $(i386_ONLY)dir path=platform/i86xpv group=sys
-$(sparc_ONLY)dir path=platform/sun4u group=sys
-$(sparc_ONLY)dir path=platform/sun4u/lib
-$(sparc_ONLY)dir path=platform/sun4u/lib/$(ARCH64)
-$(sparc_ONLY)dir path=platform/sun4u/lib/fs
-$(sparc_ONLY)dir path=platform/sun4u/lib/fs/cpio
-# We force bootblks into a new BE because we want to make sure
-# the user can recover from a pre-existing copy of the bootblk
-# in the event that something goes horribly wrong.
-$(sparc_ONLY)file path=platform/sun4u/lib/fs/cpio/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4u/lib/fs/hsfs
-$(sparc_ONLY)file path=platform/sun4u/lib/fs/hsfs/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4u/lib/fs/ufs
-$(sparc_ONLY)file path=platform/sun4u/lib/fs/ufs/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4u/lib/fs/zfs
-$(sparc_ONLY)file path=platform/sun4u/lib/fs/zfs/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4v group=sys
-$(sparc_ONLY)dir path=platform/sun4v/lib
-$(sparc_ONLY)dir path=platform/sun4v/lib/$(ARCH64)
-$(sparc_ONLY)dir path=platform/sun4v/lib/fs
-$(sparc_ONLY)dir path=platform/sun4v/lib/fs/cpio
-# We force bootblks into a new BE because we want to make sure
-# the user can recover from a pre-existing copy of the bootblk
-# in the event that something goes horribly wrong.
-$(sparc_ONLY)file path=platform/sun4v/lib/fs/cpio/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4v/lib/fs/hsfs
-$(sparc_ONLY)file path=platform/sun4v/lib/fs/hsfs/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4v/lib/fs/ufs
-$(sparc_ONLY)file path=platform/sun4v/lib/fs/ufs/bootblk group=sys mode=0444 \
-    reboot-needed=true
-$(sparc_ONLY)dir path=platform/sun4v/lib/fs/zfs
-$(sparc_ONLY)file path=platform/sun4v/lib/fs/zfs/bootblk group=sys mode=0444 \
-    reboot-needed=true
 $(i386_ONLY)legacy pkg=SUNWcar.i arch=$(ARCH).i86pc \
     desc="core software for a specific hardware platform group" \
     name="Core Architecture, (Root)"
-$(sparc_ONLY)legacy pkg=SUNWcar.u arch=$(ARCH).sun4u \
-    desc="core software for a specific hardware platform group" \
-    name="Core Architecture, (Root)"
-$(sparc_ONLY)legacy pkg=SUNWcar.v arch=$(ARCH).sun4v \
-    desc="core software for a specific hardware platform group" \
-    name="Core Architecture, (Root)"
-$(sparc_ONLY)legacy pkg=SUNWcart200.v arch=$(ARCH).sun4v \
-    desc="core software for a specific hardware platform group" \
-    name="Core Architecture, sun4v-based platforms (Root)"
 $(i386_ONLY)legacy pkg=SUNWcarx.i arch=$(ARCH).i86pc \
     desc="core software for the i86xpv virtual hardware platform" \
     name="Core Architecture i86xpv, (Root)"
diff --git a/usr/src/pkg/manifests/system-library-python-libbe-2.p5m b/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
index 94b1fd9a8b..c43a6e3445 100644
--- a/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
+++ b/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
@@ -13,20 +13,7 @@
 # Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
-set name=pkg.fmri \
-    value=pkg:/system/library/python/libbe$(PYTHON_PKGVERS)@$(PKGVERS)
-set name=pkg.summary value="py_libbe module, python2"
-set name=pkg.description value="Boot Environment Management Python2 Module"
-set name=info.classification \
-    value=org.opensolaris.category.2008:System/Libraries
+set name=pkg.fmri value=pkg:/system/library/python/libbe-27@$(PKGVERS)
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir  path=usr group=sys
-dir  path=usr/lib
-dir  path=usr/lib/python$(PYTHON_VERSION)
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/64/libbe_py.so
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/libbe_py.so
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
+
diff --git a/usr/src/pkg/manifests/system-library-python-solaris-2.p5m b/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
index a0965a8603..9b9ceaf9e2 100644
--- a/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
+++ b/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
@@ -13,23 +13,6 @@
 # Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
-set name=pkg.fmri \
-    value=pkg:/system/library/python/solaris$(PYTHON_PKGVERS)@$(PKGVERS)
-set name=pkg.summary value="solaris module, python2"
-set name=pkg.description value="Solaris Python2 Module"
-set name=info.classification \
-    value=org.opensolaris.category.2008:System/Libraries
+set name=pkg.fmri value=pkg:/system/library/python/solaris-27@$(PKGVERS)
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir  path=usr group=sys
-dir  path=usr/lib
-dir  path=usr/lib/python$(PYTHON_VERSION)
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/64
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/64/misc.so
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/__init__.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/__init__.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/misc.so
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-zfs-2.p5m b/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
index 8f9d1bd7d0..0dbb71792f 100644
--- a/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
+++ b/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
@@ -13,39 +13,6 @@
 # Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
-set name=pkg.fmri \
-    value=pkg:/system/library/python/zfs$(PYTHON_PKGVERS)@$(PKGVERS)
-set name=pkg.summary value="zfs module, python2"
-set name=pkg.description value="ZFS Python2 Module"
-set name=info.classification \
-    value=org.opensolaris.category.2008:System/Libraries
+set name=pkg.fmri value=pkg:/system/library/python/zfs-27@$(PKGVERS)
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir  path=usr group=sys
-dir  path=usr/lib
-dir  path=usr/lib/python$(PYTHON_VERSION)
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs
-dir  path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/64
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/64/ioctl.so
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/__init__.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/__init__.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/allow.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/allow.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/dataset.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/dataset.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/groupspace.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/groupspace.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/holds.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/holds.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/ioctl.so
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/table.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/table.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/unallow.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/unallow.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/userspace.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/userspace.pyc
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/util.py
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/util.pyc
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library.p5m b/usr/src/pkg/manifests/system-library.p5m
index 9474855821..23131396c9 100644
--- a/usr/src/pkg/manifests/system-library.p5m
+++ b/usr/src/pkg/manifests/system-library.p5m
@@ -704,8 +704,6 @@ $(i386_ONLY)link path=usr/lib/$(ARCH64)/libuutil.so \
     target=../../../lib/$(ARCH64)/libuutil.so.1
 link path=usr/lib/$(ARCH64)/libuutil.so.1 \
     target=../../../lib/$(ARCH64)/libuutil.so.1
-$(sparc_ONLY)link path=usr/lib/$(ARCH64)/libv12n.so target=./libv12n.so.1
-$(sparc_ONLY)file path=usr/lib/$(ARCH64)/libv12n.so.1
 link path=usr/lib/$(ARCH64)/libvolmgt.so target=libvolmgt.so.1
 file path=usr/lib/$(ARCH64)/libvolmgt.so.1
 link path=usr/lib/$(ARCH64)/libw.so target=../../../lib/$(ARCH64)/libw.so.1
@@ -968,8 +966,6 @@ link path=usr/lib/libumem.so.1 target=../../lib/libumem.so.1
 link path=usr/lib/libuuid.so target=../../lib/libuuid.so.1
 link path=usr/lib/libuuid.so.1 target=../../lib/libuuid.so.1
 link path=usr/lib/libuutil.so.1 target=../../lib/libuutil.so.1
-$(sparc_ONLY)link path=usr/lib/libv12n.so target=./libv12n.so.1
-$(sparc_ONLY)file path=usr/lib/libv12n.so.1
 link path=usr/lib/libvolmgt.so target=./libvolmgt.so.1
 file path=usr/lib/libvolmgt.so.1
 link path=usr/lib/libw.so target=../../lib/libw.so.1
@@ -1032,8 +1028,6 @@ file path=usr/lib/scsi/plugins/ses/framework/$(ARCH64)/libses.so
 file path=usr/lib/scsi/plugins/ses/framework/$(ARCH64)/ses2.so
 file path=usr/lib/scsi/plugins/ses/framework/libses.so
 file path=usr/lib/scsi/plugins/ses/framework/ses2.so
-dir  path=usr/lib/scsi/plugins/ses/vendor
-$(sparc_ONLY)dir path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)
 dir  path=usr/lib/scsi/plugins/smp
 dir  path=usr/lib/scsi/plugins/smp/engine
 dir  path=usr/lib/scsi/plugins/smp/engine/$(ARCH64)
@@ -1299,12 +1293,9 @@ license usr/src/man/man3c/THIRDPARTYLICENSE.getentropy \
     license=usr/src/man/man3c/THIRDPARTYLICENSE.getentropy
 license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \
     license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode
-$(python3_ONLY)depend type=conditional \
-    fmri=system/library/python/solaris$(PYTHON3_PKGVERS) \
+depend type=conditional fmri=system/library/python/solaris$(PYTHON3_PKGVERS) \
     predicate=runtime/python$(PYTHON3_PKGVERS)
-$(python2_ONLY)depend type=conditional \
-    fmri=system/library/python/solaris$(PYTHON_PKGVERS) \
-    predicate=runtime/python$(PYTHON_PKGVERS)
+
 #
 # libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/,
 # a dependency which cannot be automatically derived
diff --git a/usr/src/pkg/manifests/system-network-console.p5m b/usr/src/pkg/manifests/system-network-console.p5m
deleted file mode 100644
index 87f4ec95cb..0000000000
--- a/usr/src/pkg/manifests/system-network-console.p5m
+++ /dev/null
@@ -1,36 +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.
-# Copyright 2019 Peter Tribble.
-#
-
-#
-# 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:/system/network-console@$(PKGVERS)
-set name=pkg.obsolete value=true
-set name=org.opensolaris.noincorp value=true
-set name=variant.arch value=sparc
diff --git a/usr/src/pkg/manifests/system-storage-luxadm.p5m b/usr/src/pkg/manifests/system-storage-luxadm.p5m
index f85ffd7630..edce60da89 100644
--- a/usr/src/pkg/manifests/system-storage-luxadm.p5m
+++ b/usr/src/pkg/manifests/system-storage-luxadm.p5m
@@ -31,12 +31,6 @@ set name=info.classification \
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
-$(sparc_ONLY)dir path=usr/lib
-$(sparc_ONLY)dir path=usr/lib/locale
-$(sparc_ONLY)dir path=usr/lib/locale/C
-$(sparc_ONLY)dir path=usr/lib/locale/C/LC_MESSAGES
-$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/a5k_g_fc_i18n_cat
-$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/ibfirmware
 dir  path=usr/sbin
 file path=usr/sbin/luxadm mode=0555 variant.opensolaris.zone=global
 dir  path=usr/share/man/man8
diff --git a/usr/src/pkg/manifests/system-test-zfstest.p5m b/usr/src/pkg/manifests/system-test-zfstest.p5m
index 372534ca9b..97eea116bf 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.p5m
+++ b/usr/src/pkg/manifests/system-test-zfstest.p5m
@@ -548,10 +548,6 @@ $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/edonr_test.amd64 \
     mode=0555
 $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/edonr_test.i386 \
     mode=0555
-$(sparc_ONLY)file \
-    path=opt/zfs-tests/tests/functional/checksum/edonr_test.sparc mode=0555
-$(sparc_ONLY)file \
-    path=opt/zfs-tests/tests/functional/checksum/edonr_test.sparcv9 mode=0555
 file path=opt/zfs-tests/tests/functional/checksum/run_edonr_test mode=0555
 file path=opt/zfs-tests/tests/functional/checksum/run_sha2_test mode=0555
 file path=opt/zfs-tests/tests/functional/checksum/run_skein_test mode=0555
@@ -559,18 +555,10 @@ $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/sha2_test.amd64 \
     mode=0555
 $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/sha2_test.i386 \
     mode=0555
-$(sparc_ONLY)file path=opt/zfs-tests/tests/functional/checksum/sha2_test.sparc \
-    mode=0555
-$(sparc_ONLY)file \
-    path=opt/zfs-tests/tests/functional/checksum/sha2_test.sparcv9 mode=0555
 $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/skein_test.amd64 \
     mode=0555
 $(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/skein_test.i386 \
     mode=0555
-$(sparc_ONLY)file \
-    path=opt/zfs-tests/tests/functional/checksum/skein_test.sparc mode=0555
-$(sparc_ONLY)file \
-    path=opt/zfs-tests/tests/functional/checksum/skein_test.sparcv9 mode=0555
 dir  path=opt/zfs-tests/tests/functional/clean_mirror
 file path=opt/zfs-tests/tests/functional/clean_mirror/clean_mirror_001_pos \
     mode=0555
diff --git a/usr/src/pkg/manifests/system-zones-brand-s10.p5m b/usr/src/pkg/manifests/system-zones-brand-s10.p5m
index be159cbb8e..851b0ebef5 100644
--- a/usr/src/pkg/manifests/system-zones-brand-s10.p5m
+++ b/usr/src/pkg/manifests/system-zones-brand-s10.p5m
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2022 Garrett D'Amore
 #
 
 set name=pkg.fmri value=pkg:/system/zones/brand/s10@$(PKGVERS)
@@ -28,7 +29,7 @@ set name=pkg.summary value="Solaris 10 Containers: solaris10 brand support"
 set name=pkg.description value="Support for the 'Solaris10' Brand"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Virtualization
-set name=variant.arch value=$(ARCH)
+set name=variant.arch value=i386
 dir  path=etc group=sys
 dir  path=etc/brand group=sys
 dir  path=etc/brand/solaris10 group=sys
@@ -39,19 +40,6 @@ file path=etc/brand/solaris10/smf_disable.conf group=sys \
     preserve=true
 dir  path=etc/zones group=sys
 file path=etc/zones/SUNWsolaris10.xml mode=0444
-$(sparc_ONLY)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/brand group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/brand/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/s10_brand \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/sun4v group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/brand group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/brand/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/s10_brand \
-    group=sys mode=0755
 dir  path=usr group=sys
 $(i386_ONLY)dir path=usr/kernel group=sys
 $(i386_ONLY)dir path=usr/kernel/brand group=sys
@@ -83,7 +71,6 @@ file path=usr/lib/brand/solaris10/s10_boot mode=0755
 file path=usr/lib/brand/solaris10/s10_isaexec_wrapper mode=0755
 file path=usr/lib/brand/solaris10/s10_native mode=0755
 file path=usr/lib/brand/solaris10/s10_net_physical mode=0755
-file path=usr/lib/brand/solaris10/s10_python_wrapper mode=0755
 file path=usr/lib/brand/solaris10/s10_replacefile mode=0755
 file path=usr/lib/brand/solaris10/s10_support mode=0755
 file path=usr/lib/brand/solaris10/smf_disable.lst mode=0444
diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.p5m b/usr/src/pkg/manifests/system-zones-brand-sn1.p5m
index 5be5d6c0e7..4459470673 100644
--- a/usr/src/pkg/manifests/system-zones-brand-sn1.p5m
+++ b/usr/src/pkg/manifests/system-zones-brand-sn1.p5m
@@ -32,19 +32,6 @@ set name=variant.arch value=$(ARCH)
 dir  path=etc group=sys
 dir  path=etc/zones group=sys
 file path=etc/zones/SUNWsn1.xml mode=0444
-$(sparc_ONLY)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/brand group=sys
-$(sparc_ONLY)dir path=platform/sun4u/kernel/brand/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/sn1_brand \
-    group=sys mode=0755
-$(sparc_ONLY)dir path=platform/sun4v group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/brand group=sys
-$(sparc_ONLY)dir path=platform/sun4v/kernel/brand/$(ARCH64) group=sys
-$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/sn1_brand \
-    group=sys mode=0755
 dir  path=usr group=sys
 $(i386_ONLY)dir path=usr/kernel group=sys
 $(i386_ONLY)dir path=usr/kernel/brand group=sys
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 2193a1bda9..68bd0e252a 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -123,13 +123,7 @@ ROOTDIRS=					\
 	$(ROOTONBLD)/man			\
 	$(ROOTONBLD)/man/man1onbld
 
-$(BUILDPY2TOOLS)ROOTDIRS += \
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)		\
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld		\
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Checks	\
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Scm
-
-$(BUILDPY3TOOLS)ROOTDIRS +=							\
+ROOTDIRS +=							\
 	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)				\
 	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld				\
 	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/__pycache__		\
@@ -154,7 +148,6 @@ DOROOTDIRS= $(ROOTDIRS)
 clobber:= DOROOTDIRS=
 clean:= DOROOTDIRS=
 
-$(BUILDPY2TOOLS)DOROOTONBLDLIBPY= $(ROOTONBLDLIBPY)
 clobber:= DOROOTONBLDLIBPY=
 clean:= DOROOTONBLDLIBPY=
 
@@ -181,6 +174,6 @@ $(ROOTDIRS):
 	$(MKDIR) -p -m $(DIRMODE) $@
 
 $(ROOTONBLDLIBPY): $(ROOTDIRS)
-	$(RM) -r $@; $(SYMLINK) python$(PYTHON_VERSION) $@
+	$(RM) -r $@; $(SYMLINK) python$(PYTHON3_VERSION) $@
 
 FRC:
diff --git a/usr/src/tools/Makefile.python b/usr/src/tools/Makefile.python
index 63df6e7a36..229df0b945 100644
--- a/usr/src/tools/Makefile.python
+++ b/usr/src/tools/Makefile.python
@@ -85,19 +85,7 @@ pyclobber:
 	$(RM) $(CLOBBERFILES)
 	$(RM) -rf $(CLOBBERDIRS)
 
-# Python 2 module compilation
-
-python$(PYVER)/%.pyc: ../%.py
-	@[ -d $(@D) ] || mkdir $(@D)
-	$(RM) $@
-	$(PYTHON) -mpy_compile $<
-	$(MV) ../$(*).pyc $@
-
-$(ROOTPYDIR)/%.pyc: python$(PYVER)/%.pyc
-	$(INS.pyfile)
-
-# Python 3 module compilation
-
+# Python module compilation
 python$(PYVER)/__pycache__/%.cpython$(PYPKGVERS).pyc: ../%.py
 	@[ -d $(@D) ] || mkdir -p $(@D)
 	$(RM) $@
@@ -106,4 +94,3 @@ python$(PYVER)/__pycache__/%.cpython$(PYPKGVERS).pyc: ../%.py
 
 $(ROOTPYDIR)/__pycache__/%.pyc: python$(PYVER)/__pycache__/%.pyc
 	$(INS.pyfile)
-
diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh
index bd21476c29..30148be6ef 100644
--- a/usr/src/tools/env/illumos.sh
+++ b/usr/src/tools/env/illumos.sh
@@ -106,23 +106,10 @@ export ENABLE_SMB_PRINTING=
 
 # If your distro uses certain versions of Python, make sure either
 # Makefile.master contains your new defaults OR your .env file sets them.
-#export PYTHON_VERSION=2.7
-#export PYTHON_PKGVERS=-27
-#export PYTHON_SUFFIX=
 #export PYTHON3_VERSION=3.5
 #export PYTHON3_PKGVERS=-35
 #export PYTHON3_SUFFIX=m
 
-# To disable building with either Python2 or Python 3 (or both), uncomment
-# these lines:
-#export BUILDPY2='#'
-#export BUILDPY3='#'
-
-# To disable building this workspace's tools in $SRC/tools with either Python2
-# or Python3 (but not both!), uncomment either of these lines:
-#export BUILDPY2TOOLS='#'
-#export BUILDPY3TOOLS='#'
-
 # Set console color scheme either by build type:
 #
 #export RELEASE_CONSOLE_COLOR="-DDEFAULT_ANSI_FOREGROUND=ANSI_COLOR_BLACK \
diff --git a/usr/src/tools/onbld/Checks/DbLookups.py b/usr/src/tools/onbld/Checks/DbLookups.py
index 83a60a64dc..d396a68cbc 100644
--- a/usr/src/tools/onbld/Checks/DbLookups.py
+++ b/usr/src/tools/onbld/Checks/DbLookups.py
@@ -86,7 +86,7 @@ class BugDB(object):
 
 		try:
 			data = urlopen(req)
-		except HTTPError, e:
+		except HTTPError as e:
 			if e.code == 404 or e.code == 403 or e.code == 400:
 				raise NonExistentBug(cr)
 			else:
diff --git a/usr/src/tools/onbld/Checks/Makefile b/usr/src/tools/onbld/Checks/Makefile
index b6f18bdf85..1cdd9926f7 100644
--- a/usr/src/tools/onbld/Checks/Makefile
+++ b/usr/src/tools/onbld/Checks/Makefile
@@ -27,9 +27,7 @@
 
 include ../../Makefile.tools
 
-SUBDIRS=
-$(BUILDPY2TOOLS)SUBDIRS += py2
-$(BUILDPY3TOOLS)SUBDIRS += py3
+SUBDIRS=py3
 
 all :=		TARGET= all
 install :=	TARGET= install
diff --git a/usr/src/tools/onbld/Checks/py2/Makefile b/usr/src/tools/onbld/Checks/py2/Makefile
deleted file mode 100644
index 40b2b41255..0000000000
--- a/usr/src/tools/onbld/Checks/py2/Makefile
+++ /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) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Copyright 2010, Richard Lowe
-# Copyright 2014 Garrett D'Amore <garrett@damore.org>
-# Copyright 2016, Joyent, Inc.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-
-include ../Makefile.com
-
-PYVER = $(PYTHON_VERSION)
-PYPKGVERS = $(PYTHON_PKGVERS)
-PYOBJS =	$(PYSRCS:%.py=%.pyc)
-
-include ../../../Makefile.python
-
-all: $(PYVERSOJBS)
-
-install: all $(ROOTPYFILES)
-
-clean:
-
-clobber: clean pyclobber
diff --git a/usr/src/tools/onbld/Makefile b/usr/src/tools/onbld/Makefile
index 2127334ae7..8dcf63aca0 100644
--- a/usr/src/tools/onbld/Makefile
+++ b/usr/src/tools/onbld/Makefile
@@ -27,9 +27,7 @@
 
 include ../Makefile.tools
 
-SUBDIRS=Checks Scm
-$(BUILDPY2TOOLS)SUBDIRS += py2
-$(BUILDPY3TOOLS)SUBDIRS += py3
+SUBDIRS=Checks Scm py3
 
 all :=		TARGET= all
 install :=	TARGET= install
diff --git a/usr/src/tools/onbld/Scm/Makefile b/usr/src/tools/onbld/Scm/Makefile
index b6f18bdf85..2987a8bb8e 100644
--- a/usr/src/tools/onbld/Scm/Makefile
+++ b/usr/src/tools/onbld/Scm/Makefile
@@ -27,9 +27,7 @@
 
 include ../../Makefile.tools
 
-SUBDIRS=
-$(BUILDPY2TOOLS)SUBDIRS += py2
-$(BUILDPY3TOOLS)SUBDIRS += py3
+SUBDIRS= py3
 
 all :=		TARGET= all
 install :=	TARGET= install
diff --git a/usr/src/tools/onbld/Scm/py2/Makefile b/usr/src/tools/onbld/Scm/py2/Makefile
deleted file mode 100644
index 40b2b41255..0000000000
--- a/usr/src/tools/onbld/Scm/py2/Makefile
+++ /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) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Copyright 2010, Richard Lowe
-# Copyright 2014 Garrett D'Amore <garrett@damore.org>
-# Copyright 2016, Joyent, Inc.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-
-include ../Makefile.com
-
-PYVER = $(PYTHON_VERSION)
-PYPKGVERS = $(PYTHON_PKGVERS)
-PYOBJS =	$(PYSRCS:%.py=%.pyc)
-
-include ../../../Makefile.python
-
-all: $(PYVERSOJBS)
-
-install: all $(ROOTPYFILES)
-
-clean:
-
-clobber: clean pyclobber
diff --git a/usr/src/tools/onbld/py2/Makefile b/usr/src/tools/onbld/py2/Makefile
deleted file mode 100644
index 5b372bc0ce..0000000000
--- a/usr/src/tools/onbld/py2/Makefile
+++ /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) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Copyright 2010, Richard Lowe
-# Copyright 2014 Garrett D'Amore <garrett@damore.org>
-# Copyright 2016, Joyent, Inc.
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-
-include ../Makefile.com
-
-PYVER = $(PYTHON_VERSION)
-PYPKGVERS = $(PYTHON_PKGVERS)
-PYOBJS =	$(PYSRCS:%.py=%.pyc)
-
-include ../../Makefile.python
-
-all: $(PYVERSOJBS)
-
-install: all $(ROOTPYFILES)
-
-clean:
-
-clobber: clean pyclobber
diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile
index f28b285b14..ae74fc39a1 100644
--- a/usr/src/tools/scripts/Makefile
+++ b/usr/src/tools/scripts/Makefile
@@ -136,7 +136,7 @@ all:	$(SHFILES) $(PERLFILES) $(PERLMODULES) $(PYFILES) \
 	$(MAN1ONBLDFILES) $(MAKEFILES) $(SCRIPTS)
 
 onu.sh:	onu.sh.in
-	$(SED) -e "s:@PYTHON_VERSION@:$(PYTHON_VERSION):g" < onu.sh.in > $@
+	$(SED) -e "s:@PYTHON_VERSION@:$(PYTHON3_VERSION):g" < onu.sh.in > $@
 
 $(ROOTONBLDBIN)/git-nits:
 	$(RM) $(ROOTONBLDBIN)/git-nits
author	Dan McDonald <danmcd@mnx.io>	2022-07-19 11:24:20 -0400
committer	Dan McDonald <danmcd@mnx.io>	2022-07-19 11:24:20 -0400
commit	56c7f1a1c7ca3aef7200fe9d148633070f0908dc (patch)
tree	31807a50598560c84fe979887f3b14ecf8eb7d40 /usr/src
parent	81f8ded9e0469715043eb450f73e96578cb80240 (diff)
parent	708bde8c8780e5414779e4d9e7a7648886a4700e (diff)
download	illumos-joyent-OS-8397.tar.gz