18 files changed, 8 insertions, 422 deletions
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)