14295 Allow shipping an additional libbe_py

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

10 files changed, 253 insertions, 186 deletions

diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 2ab875af91..c24fa20b9f 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -24,7 +24,7 @@
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2016 RackTop Systems.
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2020 Peter Tribble
 #
 
@@ -195,10 +195,13 @@ PKGMOG_DEFINES= \
 	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) \
@@ -262,6 +265,10 @@ $(BUILDPY3) MANIFESTS += \
 	system-library-python-libbe-3.p5m \
 	system-library-python-solaris-3.p5m \
 	system-library-python-zfs-3.p5m
+$(BUILDPY3b) MANIFESTS += \
+	system-library-python-libbe-3b.p5m \
+	system-library-python-solaris-3b.p5m \
+	system-library-python-zfs-3b.p5m
 
 PKGS= $(MANIFESTS:%.p5m=%)
 DEP_PKGS= $(PKGS:%=$(PDIR)/%.dep)
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 5080566e9f..94b1fd9a8b 100644
--- a/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
+++ b/usr/src/pkg/manifests/system-library-python-libbe-2.p5m
@@ -1,25 +1,16 @@
 #
-# 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.
 #
-# 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
+# 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.
 #
+
 #
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
 set name=pkg.fmri \
@@ -31,11 +22,11 @@ set name=info.classification \
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/lib
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/64/libbe_py.so
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/libbe_py.so
+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
-$(python2_ONLY)depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
+depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-libbe-3.p5m b/usr/src/pkg/manifests/system-library-python-libbe-3.p5m
index d1382543f7..6452df74cc 100644
--- a/usr/src/pkg/manifests/system-library-python-libbe-3.p5m
+++ b/usr/src/pkg/manifests/system-library-python-libbe-3.p5m
@@ -1,39 +1,30 @@
 #
-# 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.
 #
-# 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
+# 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.
 #
+
 #
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
 set name=pkg.fmri \
     value=pkg:/system/library/python/libbe$(PYTHON3_PKGVERS)@$(PKGVERS)
-set name=pkg.summary value="py_libbe module, python3"
+set name=pkg.summary value="py_libbe module, python $(PYTHON3_VERSION)"
 set name=pkg.description value="Boot Environment Management Python3 Module"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/lib
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/libbe_py.so
+dir  path=usr/lib/python$(PYTHON3_VERSION)
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/libbe_py.so
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(python3_ONLY)depend type=require fmri=runtime/python$(PYTHON3_PKGVERS)
+depend type=require fmri=runtime/python$(PYTHON3_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-libbe-3b.p5m b/usr/src/pkg/manifests/system-library-python-libbe-3b.p5m
new file mode 100644
index 0000000000..48d4db637b
--- /dev/null
+++ b/usr/src/pkg/manifests/system-library-python-libbe-3b.p5m
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+#
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/library/python/libbe$(PYTHON3b_PKGVERS)@$(PKGVERS)
+set name=pkg.summary value="py_libbe module, python $(PYTHON3b_VERSION)"
+set name=pkg.description value="Boot Environment Management Python3 Module"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=variant.arch value=$(ARCH)
+dir  path=usr group=sys
+dir  path=usr/lib
+dir  path=usr/lib/python$(PYTHON3b_VERSION)
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/libbe_py.so
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+depend type=require fmri=runtime/python$(PYTHON3b_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 6a0c991af3..a0965a8603 100644
--- a/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
+++ b/usr/src/pkg/manifests/system-library-python-solaris-2.p5m
@@ -1,26 +1,18 @@
 #
-# 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.
 #
-# 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.
+# 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.
 #
-# 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 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
-# Copyright 2020 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"
@@ -30,14 +22,14 @@ set name=info.classification \
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/lib
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/64
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/64/misc.so
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/__init__.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/__init__.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/misc.so
+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
-$(python2_ONLY)depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
+depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-solaris-3.p5m b/usr/src/pkg/manifests/system-library-python-solaris-3.p5m
index c1681c81b7..6d21a5e1d0 100644
--- a/usr/src/pkg/manifests/system-library-python-solaris-3.p5m
+++ b/usr/src/pkg/manifests/system-library-python-solaris-3.p5m
@@ -1,42 +1,34 @@
 #
-# 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.
 #
-# 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.
+# 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.
 #
-# 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 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
-
 set name=pkg.fmri \
     value=pkg:/system/library/python/solaris$(PYTHON3_PKGVERS)@$(PKGVERS)
-set name=pkg.summary value="solaris module, python3"
+set name=pkg.summary value="solaris module, python $(PYTHON3_VERSION)"
 set name=pkg.description value="Solaris Python3 Module"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/lib
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/__init__.py
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/__pycache__
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/misc.so
+dir  path=usr/lib/python$(PYTHON3_VERSION)
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/__init__.py
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/__pycache__
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/solaris/misc.so
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(python3_ONLY)depend type=require fmri=runtime/python$(PYTHON3_PKGVERS)
+depend type=require fmri=runtime/python$(PYTHON3_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-solaris-3b.p5m b/usr/src/pkg/manifests/system-library-python-solaris-3b.p5m
new file mode 100644
index 0000000000..8110519d9c
--- /dev/null
+++ b/usr/src/pkg/manifests/system-library-python-solaris-3b.p5m
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+#
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/library/python/solaris$(PYTHON3b_PKGVERS)@$(PKGVERS)
+set name=pkg.summary value="solaris module, python $(PYTHON3b_VERSION)"
+set name=pkg.description value="Solaris Python3 Module"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=variant.arch value=$(ARCH)
+dir  path=usr group=sys
+dir  path=usr/lib
+dir  path=usr/lib/python$(PYTHON3b_VERSION)
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/solaris
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/solaris/__init__.py
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/solaris/__pycache__
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/solaris/__pycache__/__init__.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/solaris/misc.so
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+depend type=require fmri=runtime/python$(PYTHON3b_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 70da834b9b..8f9d1bd7d0 100644
--- a/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
+++ b/usr/src/pkg/manifests/system-library-python-zfs-2.p5m
@@ -1,26 +1,16 @@
 #
-# 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.
 #
-# 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
+# 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.
 #
 
 #
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
 set name=pkg.fmri \
@@ -32,30 +22,30 @@ set name=info.classification \
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/lib
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs
-$(python2_ONLY)dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/64
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/64/ioctl.so
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/__init__.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/__init__.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/allow.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/allow.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/dataset.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/dataset.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/groupspace.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/groupspace.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/holds.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/holds.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/ioctl.so
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/table.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/table.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/unallow.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/unallow.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/userspace.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/userspace.pyc
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/util.py
-$(python2_ONLY)file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs/util.pyc
+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
-$(python2_ONLY)depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
+depend type=require fmri=runtime/python$(PYTHON_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-zfs-3.p5m b/usr/src/pkg/manifests/system-library-python-zfs-3.p5m
index 23f37b01f5..b72837ac7a 100644
--- a/usr/src/pkg/manifests/system-library-python-zfs-3.p5m
+++ b/usr/src/pkg/manifests/system-library-python-zfs-3.p5m
@@ -1,60 +1,50 @@
 #
-# 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.
 #
-# 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
+# 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.
 #
 
 #
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
 #
 
 set name=pkg.fmri \
     value=pkg:/system/library/python/zfs$(PYTHON3_PKGVERS)@$(PKGVERS)
-set name=pkg.summary value="zfs module, python3"
+set name=pkg.summary value="zfs module, python $(PYTHON3_VERSION)"
 set name=pkg.description value="ZFS Python3 Module"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=variant.arch value=$(ARCH)
 dir  path=usr group=sys
 dir  path=usr/lib
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__init__.py
-$(python3_ONLY)dir path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/allow.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/dataset.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/groupspace.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/holds.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/table.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/unallow.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/userspace.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/util.cpython$(PYTHON3_PKGVERS).pyc
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/allow.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/dataset.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/groupspace.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/holds.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/ioctl.so
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/table.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/unallow.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/userspace.py
-$(python3_ONLY)file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/util.py
+dir  path=usr/lib/python$(PYTHON3_VERSION)
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__init__.py
+dir  path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/__init__.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/allow.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/dataset.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/groupspace.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/holds.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/table.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/unallow.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/userspace.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/__pycache__/util.cpython$(PYTHON3_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/allow.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/dataset.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/groupspace.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/holds.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/ioctl.so
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/table.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/unallow.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/userspace.py
+file path=usr/lib/python$(PYTHON3_VERSION)/vendor-packages/zfs/util.py
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(python3_ONLY)depend type=require fmri=runtime/python$(PYTHON3_PKGVERS)
+depend type=require fmri=runtime/python$(PYTHON3_PKGVERS)
diff --git a/usr/src/pkg/manifests/system-library-python-zfs-3b.p5m b/usr/src/pkg/manifests/system-library-python-zfs-3b.p5m
new file mode 100644
index 0000000000..738386e833
--- /dev/null
+++ b/usr/src/pkg/manifests/system-library-python-zfs-3b.p5m
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+
+#
+# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/library/python/zfs$(PYTHON3b_PKGVERS)@$(PKGVERS)
+set name=pkg.summary value="zfs module, python $(PYTHON3b_VERSION)"
+set name=pkg.description value="ZFS Python3 Module"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=variant.arch value=$(ARCH)
+dir  path=usr group=sys
+dir  path=usr/lib
+dir  path=usr/lib/python$(PYTHON3b_VERSION)
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__init__.py
+dir  path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/__init__.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/allow.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/dataset.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/groupspace.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/holds.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/table.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/unallow.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/userspace.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/__pycache__/util.cpython$(PYTHON3b_PKGVERS).pyc
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/allow.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/dataset.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/groupspace.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/holds.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/ioctl.so
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/table.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/unallow.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/userspace.py
+file path=usr/lib/python$(PYTHON3b_VERSION)/vendor-packages/zfs/util.py
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+depend type=require fmri=runtime/python$(PYTHON3b_PKGVERS)