diff options
48 files changed, 102 insertions, 1045 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 526cee9aef..14df939e5b 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 @@ -1261,11 +1254,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 8dcd612891..a8ee77b2c4 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -65,22 +65,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 \ @@ -313,7 +298,6 @@ DIRS= \ /usr/net \ /usr/net/servers \ /usr/lib/pool \ - $(PYTHON2_DIRS) \ /usr/lib/rcap \ /usr/lib/rcap/$(MACH32) \ /usr/lib/sa \ @@ -481,7 +465,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 77a103c554..99013197f9 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 8e9db913b1..dd797234ae 100644 --- a/usr/src/cmd/mdb/Makefile.module +++ b/usr/src/cmd/mdb/Makefile.module @@ -96,9 +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) +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 f454b29658..7a43f8d9f7 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..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 diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile index 6a1f363ce9..e9acd189d8 100644 --- a/usr/src/tools/Makefile +++ b/usr/src/tools/Makefile @@ -122,13 +122,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__ \ @@ -153,7 +147,6 @@ DOROOTDIRS= $(ROOTDIRS) clobber:= DOROOTDIRS= clean:= DOROOTDIRS= -$(BUILDPY2TOOLS)DOROOTONBLDLIBPY= $(ROOTONBLDLIBPY) clobber:= DOROOTONBLDLIBPY= clean:= DOROOTONBLDLIBPY= @@ -180,6 +173,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 77446ffce3..08765b1bc7 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/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 |