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>

6 files changed, 3 insertions, 144 deletions

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