14769 remove support for Python 2.x

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>

10 files changed, 64 insertions, 288 deletions

diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index c24fa20b9f..1e1a265c02 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -193,17 +193,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)
 
@@ -251,21 +245,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 +703,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) \\" \
diff --git a/usr/src/pkg/manifests/developer-build-onbld.p5m b/usr/src/pkg/manifests/developer-build-onbld.p5m
index ca55e019f7..49a552913d 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.p5m
+++ b/usr/src/pkg/manifests/developer-build-onbld.p5m
@@ -144,242 +144,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..48bbc3f04f 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb.p5m
+++ b/usr/src/pkg/manifests/developer-debug-mdb.p5m
@@ -199,7 +199,7 @@ 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 +215,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
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/system-file-system-zfs.p5m b/usr/src/pkg/manifests/system-file-system-zfs.p5m
index afe1c20709..7423511cae 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.p5m
+++ b/usr/src/pkg/manifests/system-file-system-zfs.p5m
@@ -153,9 +153,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-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..4bc9f32828 100644
--- a/usr/src/pkg/manifests/system-library.p5m
+++ b/usr/src/pkg/manifests/system-library.p5m
@@ -1299,12 +1299,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-zones-brand-s10.p5m b/usr/src/pkg/manifests/system-zones-brand-s10.p5m
index be159cbb8e..e322e304f6 100644
--- a/usr/src/pkg/manifests/system-zones-brand-s10.p5m
+++ b/usr/src/pkg/manifests/system-zones-brand-s10.p5m
@@ -83,7 +83,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