5969 update illumos-gate to use python2.7

Portions contributed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Andrew Stormont <astormont@racktopsystems.com>
Reviewed by: Albert Lee <trisk@omniti.com>
Reviewed by: Adam Stevko <adam.stevko@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>

50 files changed, 243 insertions, 182 deletions

diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index 3f1e2a7ab1..75782315c7 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -139,8 +139,8 @@ UNUSED_RPATH	/usr/postgres/8.3/lib.*\ from\ .*libpq\.so\.5
 UNUSED_RPATH	/usr/sfw/lib.*\ from\ .*libpq\.so\.5
 UNUSED_RPATH	/usr/lib.*\ from\ .*/usr/lib/mps
 UNUSED_RPATH	/usr/ccs/lib.*\ from\ .*/usr/lib/mps
-UNUSED_RPATH	/usr/gnu/lib.*\ from\ .*/usr/lib/libpython2\.6
-UNUSED_RPATH	/usr/gnu/lib.*\ from\ .*/usr/lib/64/libpython2\.6
+UNUSED_RPATH	/usr/gnu/lib.*\ from\ .*/usr/lib/libpython2\..
+UNUSED_RPATH	/usr/gnu/lib.*\ from\ .*/usr/lib/64/libpython2\..
 UNUSED_RPATH	/usr/snadm/lib.*\ from\ .*/usr/snadm/lib/libspmicommon\.so\.1
 
 
diff --git a/exception_lists/interface_check b/exception_lists/interface_check
index b3c4bd5e5c..61db277347 100644
--- a/exception_lists/interface_check
+++ b/exception_lists/interface_check
@@ -56,7 +56,7 @@ PLUGIN		^usr/lib/lp/ipp
 PLUGIN		^usr/lib/mdb
 PLUGIN		^usr/lib/pci
 PLUGIN		^usr/lib/picl/plugins
-PLUGIN		^usr/lib/python2.[46]
+PLUGIN		^usr/lib/python2.[467]
 PLUGIN		^usr/lib/rcm/modules
 PLUGIN		^usr/lib/scsi/plugins
 PLUGIN		^usr/lib/sysevent/modules
diff --git a/exception_lists/keywords b/exception_lists/keywords
index 6037b93c21..251b4339c1 100644
--- a/exception_lists/keywords
+++ b/exception_lists/keywords
@@ -38,4 +38,4 @@ usr/src/cmd/terminfo/terminfo.src
 usr/src/cmd/zonestat/zonestat/zonestat.c
 usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
 usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
-usr/src/test/test-runner/cmd/run.py
+usr/src/test/test-runner/cmd/run
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 279feec79e..efda1ed727 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -177,8 +177,9 @@ PERL_VERSION=	5.10.0
 PERL_PKGVERS=	-510
 PERL_ARCH =		i86pc-solaris-64int
 $(SPARC_BLD)PERL_ARCH =	sun4-solaris-64int
-PYTHON_26=	/usr/bin/python2.6
-PYTHON=		$(PYTHON_26)
+PYTHON_VERSION=	2.7
+PYTHON_PKGVERS=	-27
+PYTHON=		/usr/bin/python$(PYTHON_VERSION)
 SORT=		/usr/bin/sort
 TOUCH=		/usr/bin/touch
 WC=		/usr/bin/wc
@@ -246,7 +247,7 @@ INS.symlink=	$(RM) $@; $(SYMLINK) $(INSLINKTARGET) $@
 # files we must make certain to not adjust the mtime of the source
 # (.py) file.
 #
-INS.pyfile=	$(INS.file); $(TOUCH) -r $< $@
+INS.pyfile=	$(RM) $@; $(SED) -e "1s:^\#!@PYTHON@:\#!/usr/bin/python$(PYTHON_VERSION):" < $< > $@; $(CHMOD) $(FILEMODE) $@; $(TOUCH) -r $< $@
 
 # MACH must be set in the shell environment per uname -p on the build host
 # More specific architecture variables should be set in lower makefiles.
@@ -1095,7 +1096,7 @@ PKGPUBLISHER_NONREDIST=	on-extra
 	$(CHMOD) +x $@
 
 .py:
-	$(RM) $@; $(CAT) $< > $@; $(CHMOD) +x $@
+	$(RM) $@; $(SED) -e "1s:^\#!@PYTHON@:\#!/usr/bin/python$(PYTHON_VERSION):" < $< > $@; $(CHMOD) +x $@
 
 .py.pyc:
 	$(RM) $@
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index a015bf9b9b..1e4e0a2751 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -283,12 +283,12 @@ DIRS= \
 	/usr/net \
 	/usr/net/servers \
 	/usr/lib/pool \
-	/usr/lib/python2.6 \
-	/usr/lib/python2.6/vendor-packages \
-	/usr/lib/python2.6/vendor-packages/64 \
-	/usr/lib/python2.6/vendor-packages/solaris \
-	/usr/lib/python2.6/vendor-packages/zfs \
-	/usr/lib/python2.6/vendor-packages/beadm \
+	/usr/lib/python$(PYTHON_VERSION) \
+	/usr/lib/python$(PYTHON_VERSION)/vendor-packages \
+	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 \
+	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris \
+	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs \
+	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/beadm \
 	/usr/lib/rcap \
 	/usr/lib/rcap/$(MACH32) \
 	/usr/lib/sa  \
diff --git a/usr/src/cmd/mdb/Makefile.common b/usr/src/cmd/mdb/Makefile.common
index 4d79ba0a18..ebdeac9f3a 100644
--- a/usr/src/cmd/mdb/Makefile.common
+++ b/usr/src/cmd/mdb/Makefile.common
@@ -34,7 +34,7 @@ COMMON_MODULES_PROC = \
 	libfksmbsrv \
 	libnvpair \
 	libproc \
-	libpython2.6 \
+	libpython \
 	libsysevent \
 	libtopo \
 	libumem \
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index f741cd8278..47a3e15fe2 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -31,13 +31,20 @@
 
 include $(SRC)/cmd/mdb/Makefile.tools
 
+#
+# Make sure we're getting a consistent execution environment for the
+# embedded scripts.
+#
+SHELL= /usr/bin/ksh93
+
 $(KMOD_SOURCES_DIFFERENT)KMODSRCS = $(MODSRCS)
 $(KMOD_SOURCES_DIFFERENT)KMODASMSRCS = $(MODASMSRCS)
 
 MODOBJS = $(MODSRCS:%.c=dmod/%.o) $(MODASMSRCS:%.s=dmod/%.o)
 KMODOBJS = $(KMODSRCS:%.c=kmod/%.o) $(KMODASMSRCS:%.s=kmod/%.o)
 
-MODNAME = $(MODULE:%.so=%)
+MODNAME_cmd = if [ -n "$(MODULE_NAME)" ]; then print $(MODULE_NAME); else print $(MODULE)| sed -e 's:\.so$$::'; fi
+MODNAME = $(MODNAME_cmd:sh)
 KMODULE = $(MODNAME)
 
 MODFILE = dmod/$(MODULE)
@@ -101,7 +108,7 @@ C99MODE			= $(C99_ENABLE)
 
 CFLAGS			+= $(CCVERBOSE)
 CFLAGS64		+= $(CCVERBOSE)
-CPPFLAGS		+= $($(MDBTGT)_TGTFLAGS) -I../../../common
+CPPFLAGS		+= $($(MDBTGT)_TGTFLAGS) -I../../../common -I/usr/include/python$(PYTHON_VERSION)
 LDFLAGS			+= $(ZTEXT)
 LDFLAGS64		+= $(ZTEXT)
 ASFLAGS			+= -P
diff --git a/usr/src/cmd/mdb/common/modules/libpython2.6/libpython26.c b/usr/src/cmd/mdb/common/modules/libpython/libpython.c
index 9d4635326d..57b8eaec70 100644
--- a/usr/src/cmd/mdb/common/modules/libpython2.6/libpython26.c
+++ b/usr/src/cmd/mdb/common/modules/libpython/libpython.c
@@ -31,14 +31,14 @@
 #include <link.h>
 #include <libproc.h>
 
-#include <python2.6/Python.h>
-#include <python2.6/frameobject.h>
+#include <Python.h>
+#include <frameobject.h>
 
 /*
  * Decoding Python Stack Frames
  * ============================
  *
- * Python2.6 uses a variety of objects to construct its call chain.  An address
+ * Python2 uses a variety of objects to construct its call chain.  An address
  * space may have one or more PyInterpreterState objects, which are the base
  * object in the interpreter's state.  These objects are kept in a linked list
  * with a head pointer named interp_head.  This makes it possible for the
@@ -110,8 +110,8 @@
 
 /*
  * The Python-dependent debugging functionality lives in its own helper
- * library.  The helper agent is provided by libpython2.6_db.so, which is also
- * used by pstack(1) for debugging Python processes.
+ * library.  The helper agent is provided by libpython2.[67]_db.so, which
+ * is also used by pstack(1) for debugging Python processes.
  *
  * Define needed prototypes here.
  */
diff --git a/usr/src/cmd/mdb/intel/amd64/libpython2.6/Makefile b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
index 7f2e268e42..cd4f4c669f 100644
--- a/usr/src/cmd/mdb/intel/amd64/libpython2.6/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/libpython/Makefile
@@ -23,12 +23,15 @@
 # Use is subject to license terms.
 #
 
-MODULE = libpython2.6.so
+include $(SRC)/Makefile.master
+
+MODULE = libpython$(PYTHON_VERSION).so
 MDBTGT = proc
+MODULE_NAME = libpython
 
-MODSRCS_DIR = ../../../common/modules/libpython2.6
+MODSRCS_DIR = ../../../common/modules/libpython
 
-MODSRCS = libpython26.c
+MODSRCS = libpython.c
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
diff --git a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
index 1928c56cd3..2abfe7acb6 100644
--- a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
@@ -23,12 +23,15 @@
 # Use is subject to license terms.
 #
 
-MODULE = libpython2.6.so
+include $(SRC)/Makefile.master
+
+MODULE = libpython$(PYTHON_VERSION).so
 MDBTGT = proc
+MODULE_NAME = libpython
 
-MODSRCS_DIR = ../../../common/modules/libpython2.6
+MODSRCS_DIR = ../../../common/modules/libpython
 
-MODSRCS = libpython26.c
+MODSRCS = libpython.c
 
 include ../../../../Makefile.cmd
 include ../../Makefile.ia32
diff --git a/usr/src/cmd/mdb/sparc/v7/libpython2.6/Makefile b/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
index 67fa9e938f..f0c2120e4f 100644
--- a/usr/src/cmd/mdb/sparc/v7/libpython2.6/Makefile
+++ b/usr/src/cmd/mdb/sparc/v7/libpython/Makefile
@@ -23,12 +23,15 @@
 # Use is subject to license terms.
 #
 
-MODULE = libpython2.6.so
+include $(SRC)/Makefile.master
+
+MODULE = libpython$(PYTHON_VERSION).so
 MDBTGT = proc
+MODULE_NAME = libpython
 
-MODSRCS_DIR = ../../../common/modules/libpython2.6
+MODSRCS_DIR = ../../../common/modules/libpython
 
-MODSRCS = libpython26.c
+MODSRCS = libpython.c
 
 include ../../../../Makefile.cmd
 include ../../Makefile.sparcv7
diff --git a/usr/src/cmd/mdb/sparc/v9/libpython2.6/Makefile b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
index abccb3974c..cb3d7a78b8 100644
--- a/usr/src/cmd/mdb/sparc/v9/libpython2.6/Makefile
+++ b/usr/src/cmd/mdb/sparc/v9/libpython/Makefile
@@ -23,12 +23,15 @@
 # Use is subject to license terms.
 #
 
-MODULE = libpython2.6.so
+include $(SRC)/Makefile.master
+
+MODULE = libpython$(PYTHON_VERSION).so
 MDBTGT = proc
+MODULE_NAME = libpython
 
-MODSRCS_DIR = ../../../common/modules/libpython2.6
+MODSRCS_DIR = ../../../common/modules/libpython
 
-MODSRCS = libpython26.c
+MODSRCS = libpython.c
 
 include ../../../../Makefile.cmd
 include ../../../../Makefile.cmd.64
diff --git a/usr/src/cmd/pyzfs/Makefile b/usr/src/cmd/pyzfs/Makefile
index 65d3594902..8895ccf525 100644
--- a/usr/src/cmd/pyzfs/Makefile
+++ b/usr/src/cmd/pyzfs/Makefile
@@ -30,7 +30,6 @@ PYSRCS=		pyzfs.py
 PYOBJS=		$(PYSRCS:%.py=%.pyc)
 PYFILES=	$(PYSRCS) $(PYOBJS)
 POFILE=		pyzfs.po
-PYTHON=		$(PYTHON_26)
 
 ROOTLIBZFSFILES= $(PYFILES:%=$(ROOTLIB)/zfs/%)
 
diff --git a/usr/src/cmd/pyzfs/pyzfs.py b/usr/src/cmd/pyzfs/pyzfs.py
index 2088993d6d..03f29062d0 100644
--- a/usr/src/cmd/pyzfs/pyzfs.py
+++ b/usr/src/cmd/pyzfs/pyzfs.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6 -S
+#!@PYTHON@ -S
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/brand/solaris10/cmd/Makefile b/usr/src/lib/brand/solaris10/cmd/Makefile
index bad81c8f61..99ac1cce10 100644
--- a/usr/src/lib/brand/solaris10/cmd/Makefile
+++ b/usr/src/lib/brand/solaris10/cmd/Makefile
@@ -31,6 +31,10 @@ 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:
 
@@ -41,6 +45,6 @@ lint:
 install: all $(ROOTPROGS)
 
 clean:
-	$(RM) $(PROGS)
+	$(RM) $(PROGS) $(CLEANFILES)
 
 include $(SRC)/cmd/Makefile.targ
diff --git a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh b/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
index b884f62a92..ecb7c27155 100644
--- a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh
+++ b/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh.in
@@ -38,7 +38,7 @@
 pyname=$0
 n=/.SUNWnative
 
-PYTHONPATH=/.SUNWnative/usr/lib/python2.6/vendor-packages
+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
@@ -56,4 +56,4 @@ exec $n/usr/lib/brand/solaris10/s10_native \
     -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/python2.6 $n$pyname "$@"
+    $n/usr/bin/python@PYTHON_VERSION@ $n$pyname "$@"
diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com
index 9f964ce417..19240f56a5 100644
--- a/usr/src/lib/pylibbe/Makefile.com
+++ b/usr/src/lib/pylibbe/Makefile.com
@@ -30,11 +30,10 @@ OBJECTS =	libbe_py.o
 
 include ../../Makefile.lib
 
-PYTHON = 	$(PYTHON_26)
 LIBLINKS = 
 SRCDIR =	../common
-ROOTLIBDIR=	$(ROOT)/usr/lib/python2.6/vendor-packages
-ROOTLIBDIR64=	$(ROOT)/usr/lib/python2.6/vendor-packages/64
+ROOTLIBDIR=	$(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages
+ROOTLIBDIR64=	$(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
 PYOBJS=		$(PYSRCS:%.py=$(SRCDIR)/%.pyc)
 PYFILES=	$(PYSRCS) $(PYSRCS:%.py=%.pyc)
 ROOTPYBEFILES=  $(PYFILES:%=$(ROOTLIBDIR)/%)
@@ -44,12 +43,12 @@ C99MODE=        $(C99_ENABLE)
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lbe -lnvpair -lc
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6 \
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION) \
 		-D_FILE_OFFSET_BITS=64 -I../../libbe/common
 
 .KEEP_STATE:
 
-all install := LDLIBS += -lpython2.6
+all install := LDLIBS += -lpython$(PYTHON_VERSION)
 
 all: $(PYOBJS) $(LIBS)
 
diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com
index 28d68704f9..7423665381 100644
--- a/usr/src/lib/pysolaris/Makefile.com
+++ b/usr/src/lib/pysolaris/Makefile.com
@@ -32,20 +32,19 @@ include ../../Makefile.lib
 
 LIBLINKS = 
 SRCDIR =	../common
-ROOTLIBDIR=	$(ROOT)/usr/lib/python2.6/vendor-packages/solaris
+ROOTLIBDIR=	$(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris
 PYOBJS=		$(PYSRCS:%.py=$(SRCDIR)/%.pyc)
 PYFILES=	$(PYSRCS) $(PYSRCS:%.py=%.pyc)
 ROOTPYSOLFILES= $(PYFILES:%=$(ROOTLIBDIR)/%)
-PYTHON=		$(PYTHON_26)
 
 C99MODE=        -xc99=%all
 C99LMODE=       -Xc99=%all
 
 LIBS =		$(DYNLIB)
-LDLIBS +=	-lc -lsec -lidmap -lpython2.6
+LDLIBS +=	-lc -lsec -lidmap -lpython$(PYTHON_VERSION)
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
 
 .KEEP_STATE:
 
@@ -56,6 +55,9 @@ install: all $(ROOTPYSOLFILES)
 $(ROOTLIBDIR)/%: %
 	$(INS.pyfile)
 
+$(ROOTLIBDIR)/%: ../common/%
+	$(INS.pyfile)
+
 lint: lintcheck
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/pysolaris/common/__init__.py b/usr/src/lib/pysolaris/common/__init__.py
index 1119f0645a..c811dbb347 100644
--- a/usr/src/lib/pysolaris/common/__init__.py
+++ b/usr/src/lib/pysolaris/common/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com
index 0c996d0711..668151416d 100644
--- a/usr/src/lib/pyzfs/Makefile.com
+++ b/usr/src/lib/pyzfs/Makefile.com
@@ -35,8 +35,7 @@ include ../../Makefile.lib
 
 LIBLINKS = 
 SRCDIR =	../common
-ROOTLIBDIR=	$(ROOT)/usr/lib/python2.6/vendor-packages/zfs
-PYTHON=		$(PYTHON_26)
+ROOTLIBDIR=	$(ROOT)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs
 PYOBJS=		$(PYSRCS:%.py=$(SRCDIR)/%.pyc)
 PYFILES=	$(PYSRCS) $(PYSRCS:%.py=%.pyc)
 ROOTPYZFSFILES= $(PYFILES:%=$(ROOTLIBDIR)/%)
@@ -45,10 +44,10 @@ C99MODE=        -xc99=%all
 C99LMODE=       -Xc99=%all
 
 LIBS =		$(DYNLIB)
-LDLIBS +=	-lc -lnvpair -lpython2.6 -lzfs
+LDLIBS +=	-lc -lnvpair -lpython$(PYTHON_VERSION) -lzfs
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
 CPPFLAGS +=	-I../../../uts/common/fs/zfs
 CPPFLAGS +=	-I../../../common/zfs
 
@@ -61,6 +60,9 @@ install: all $(ROOTPYZFSFILES)
 $(ROOTLIBDIR)/%: %
 	$(INS.pyfile)
 
+$(ROOTLIBDIR)/%: ../common/%
+	$(INS.pyfile)
+
 lint: lintcheck
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/pyzfs/common/__init__.py b/usr/src/lib/pyzfs/common/__init__.py
index 76b0998a3e..5a99094658 100644
--- a/usr/src/lib/pyzfs/common/__init__.py
+++ b/usr/src/lib/pyzfs/common/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/allow.py b/usr/src/lib/pyzfs/common/allow.py
index 7ad4b49cc3..2c01280b4b 100644
--- a/usr/src/lib/pyzfs/common/allow.py
+++ b/usr/src/lib/pyzfs/common/allow.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/dataset.py b/usr/src/lib/pyzfs/common/dataset.py
index 26192e4075..9d4652235a 100644
--- a/usr/src/lib/pyzfs/common/dataset.py
+++ b/usr/src/lib/pyzfs/common/dataset.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/groupspace.py b/usr/src/lib/pyzfs/common/groupspace.py
index 9f380fdb89..6193456a32 100644
--- a/usr/src/lib/pyzfs/common/groupspace.py
+++ b/usr/src/lib/pyzfs/common/groupspace.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/holds.py b/usr/src/lib/pyzfs/common/holds.py
index 800e28f974..0a1508e76a 100644
--- a/usr/src/lib/pyzfs/common/holds.py
+++ b/usr/src/lib/pyzfs/common/holds.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/table.py b/usr/src/lib/pyzfs/common/table.py
index d2a45a142c..87aab1d6f1 100644
--- a/usr/src/lib/pyzfs/common/table.py
+++ b/usr/src/lib/pyzfs/common/table.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/unallow.py b/usr/src/lib/pyzfs/common/unallow.py
index cbdd4dd73f..630067946e 100644
--- a/usr/src/lib/pyzfs/common/unallow.py
+++ b/usr/src/lib/pyzfs/common/unallow.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/userspace.py b/usr/src/lib/pyzfs/common/userspace.py
index 8464f54b89..79355e1e23 100644
--- a/usr/src/lib/pyzfs/common/userspace.py
+++ b/usr/src/lib/pyzfs/common/userspace.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/lib/pyzfs/common/util.py b/usr/src/lib/pyzfs/common/util.py
index a33c6693ee..cfc21ac57c 100644
--- a/usr/src/lib/pyzfs/common/util.py
+++ b/usr/src/lib/pyzfs/common/util.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 35a7f6e27d..a00bdfc452 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -180,7 +180,9 @@ PKGMOG_DEFINES= \
 	PKGVERS=$(PKGVERS) \
 	PERL_ARCH=$(PERL_ARCH) \
 	PERL_VERSION=$(PERL_VERSION) \
-	PERL_PKGVERS=$(PERL_PKGVERS)
+	PERL_PKGVERS=$(PERL_PKGVERS) \
+	PYTHON_VERSION=$(PYTHON_VERSION) \
+	PYTHON_PKGVERS=$(PYTHON_PKGVERS)
 
 PKGDEP_TOKENS_i386= \
 	'PLATFORM=i86hvm' \
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index d6f449f2bc..5bc5cf97e6 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -52,11 +52,11 @@ dir path=opt/onbld/lib
 dir path=opt/onbld/lib/$(ARCH)
 dir path=opt/onbld/lib/$(ARCH)/64
 dir path=opt/onbld/lib/perl
-dir path=opt/onbld/lib/python2.6
-dir path=opt/onbld/lib/python2.6/onbld
-dir path=opt/onbld/lib/python2.6/onbld/Checks
-dir path=opt/onbld/lib/python2.6/onbld/Scm
-dir path=opt/onbld/lib/python2.6/onbld/hgext
+dir path=opt/onbld/lib/python$(PYTHON_VERSION)
+dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld
+dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks
+dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm
+dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/hgext
 dir path=opt/onbld/man
 dir path=opt/onbld/man/man1onbld
 dir path=opt/onbld/share
@@ -146,49 +146,83 @@ file path=opt/onbld/lib/$(ARCH)/libdwarf.so.1
 file path=opt/onbld/lib/$(ARCH)/libmakestate.so.1
 file path=opt/onbld/lib/perl/onbld_elfmod.pm
 file path=opt/onbld/lib/perl/onbld_elfmod_vertype.pm
-file path=opt/onbld/lib/python2.6/onbld/Checks/CStyle.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/CStyle.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Cddl.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Cddl.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/CmtBlk.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/CmtBlk.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Comments.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Comments.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Copyright.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Copyright.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/DbLookups.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/DbLookups.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/HdrChk.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/HdrChk.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/JStyle.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/JStyle.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Keywords.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Keywords.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/ManLint.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/ManLint.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Mapfile.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/Mapfile.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/ProcessCheck.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/ProcessCheck.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/SpellCheck.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/SpellCheck.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/__init__.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Checks/__init__.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/Backup.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/Backup.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/Ignore.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/Ignore.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/Version.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/Version.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/WorkSpace.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/WorkSpace.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/__init__.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/Scm/__init__.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/__init__.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/__init__.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/hgext/__init__.py mode=0444
-file path=opt/onbld/lib/python2.6/onbld/hgext/__init__.pyc mode=0444
-file path=opt/onbld/lib/python2.6/onbld/hgext/cdm.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CStyle.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CStyle.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Cddl.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Cddl.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CmtBlk.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CmtBlk.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Comments.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Comments.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Copyright.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Copyright.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/DbLookups.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/DbLookups.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/HdrChk.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/HdrChk.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/JStyle.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/JStyle.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Keywords.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Keywords.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ManLint.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ManLint.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Mapfile.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/Mapfile.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ProcessCheck.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/ProcessCheck.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/SpellCheck.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/SpellCheck.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/__init__.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/__init__.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Backup.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Backup.pyc mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Ignore.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Ignore.pyc mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Version.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/Version.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/WorkSpace.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/WorkSpace.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/__init__.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/__init__.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/__init__.py mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/__init__.pyc mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/hgext/__init__.py \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/hgext/__init__.pyc \
+    mode=0444
+file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/hgext/cdm.py mode=0444
 file path=opt/onbld/man/man1onbld/Install.1onbld
 file path=opt/onbld/man/man1onbld/bldenv.1onbld
 file path=opt/onbld/man/man1onbld/bringovercheck.1onbld
@@ -234,7 +268,7 @@ license usr/src/tools/onbld/THIRDPARTYLICENSE \
     license=usr/src/tools/onbld/THIRDPARTYLICENSE
 link path=opt/onbld/bin/$(ARCH)/dmake target=make
 link path=opt/onbld/bin/git-nits target=git-pbchk
-link path=opt/onbld/lib/python target=python2.6
+link path=opt/onbld/lib/python target=python$(PYTHON_VERSION)
 link path=opt/onbld/man/man1onbld/git-nits.1onbld target=git-pbchk.1onbld
 # webrev(1) requires ps2pdf
 depend fmri=print/filter/ghostscript type=require
diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf
index f1929da69b..2cd8a0299e 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb.mf
@@ -296,7 +296,8 @@ file path=usr/lib/mdb/proc/$(ARCH64)/libc.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libcmdutils.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)/libpython2.6.so group=sys mode=0555
+file path=usr/lib/mdb/proc/$(ARCH64)/libpython$(PYTHON_VERSION).so group=sys \
+    mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libsysevent.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libtopo.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libumem.so group=sys mode=0555
@@ -310,7 +311,7 @@ file path=usr/lib/mdb/proc/libc.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libcmdutils.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/libpython2.6.so group=sys mode=0555
+file path=usr/lib/mdb/proc/libpython$(PYTHON_VERSION).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
 file path=usr/lib/mdb/proc/libumem.so group=sys mode=0555
diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.mf
index 2a94f501ca..05f83de46b 100644
--- a/usr/src/pkg/manifests/install-beadm.mf
+++ b/usr/src/pkg/manifests/install-beadm.mf
@@ -34,10 +34,10 @@ dir path=usr group=sys
 dir path=usr/include
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
-dir path=usr/lib/python2.6/vendor-packages/beadm
+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
+dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/beadm
 dir path=usr/sbin
 dir path=usr/share
 dir path=usr/share/man
@@ -49,8 +49,8 @@ file path=usr/lib/$(ARCH64)/llib-lbe.ln
 file path=usr/lib/libbe.so.1
 file path=usr/lib/llib-lbe
 file path=usr/lib/llib-lbe.ln
-file path=usr/lib/python2.6/vendor-packages/64/libbe_py.so
-file path=usr/lib/python2.6/vendor-packages/libbe_py.so
+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
 file path=usr/share/man/man1m/beadm.1m
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf
index 2b632296dd..e0474cd0d0 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs.mf
@@ -66,9 +66,9 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
 dir path=usr/lib/mdb/proc group=sys
 $(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 $(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64)
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/zfs
+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/sysevent
 dir path=usr/lib/sysevent/modules
 dir path=usr/lib/zfs
@@ -108,25 +108,25 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/zfs.so group=sys mode=0555
 file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555
 file path=usr/lib/mdb/proc/libzpool.so group=sys mode=0555
-file path=usr/lib/python2.6/vendor-packages/zfs/__init__.py
-file path=usr/lib/python2.6/vendor-packages/zfs/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/allow.py
-file path=usr/lib/python2.6/vendor-packages/zfs/allow.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/dataset.py
-file path=usr/lib/python2.6/vendor-packages/zfs/dataset.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.py
-file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/holds.py
-file path=usr/lib/python2.6/vendor-packages/zfs/holds.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/ioctl.so
-file path=usr/lib/python2.6/vendor-packages/zfs/table.py
-file path=usr/lib/python2.6/vendor-packages/zfs/table.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/unallow.py
-file path=usr/lib/python2.6/vendor-packages/zfs/unallow.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/userspace.py
-file path=usr/lib/python2.6/vendor-packages/zfs/userspace.pyc
-file path=usr/lib/python2.6/vendor-packages/zfs/util.py
-file path=usr/lib/python2.6/vendor-packages/zfs/util.pyc
+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
 file path=usr/lib/sysevent/modules/zfs_mod.so group=sys
 file path=usr/lib/zfs/availdevs mode=0555
 file path=usr/lib/zfs/pyzfs.py mode=0555
@@ -185,4 +185,4 @@ link path=usr/lib/llib-lzfs_core target=../../lib/llib-lzfs_core
 link path=usr/lib/llib-lzfs_core.ln target=../../lib/llib-lzfs_core.ln
 link path=usr/sbin/zfs target=../../sbin/zfs
 link path=usr/sbin/zpool target=../../sbin/zpool
-depend fmri=runtime/python-26 type=require
+depend fmri=runtime/python$(PYTHON_PKGVERS) type=require
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 1842a62f06..000169ef55 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -99,9 +99,9 @@ dir path=usr/lib/iconv/$(ARCH64)
 $(i386_ONLY)dir path=usr/lib/libc
 dir path=usr/lib/lwp
 dir path=usr/lib/lwp/$(ARCH64)
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/solaris
+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/raidcfg
 dir path=usr/lib/raidcfg/$(ARCH64)
 dir path=usr/lib/scsi
@@ -452,9 +452,9 @@ file path=usr/lib/libzoneinfo.so.1
 file path=usr/lib/nss_ad.so.1
 file path=usr/lib/nss_ldap.so.1
 file path=usr/lib/passwdutil.so.1
-file path=usr/lib/python2.6/vendor-packages/solaris/__init__.py
-file path=usr/lib/python2.6/vendor-packages/solaris/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/solaris/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
 file path=usr/lib/raidcfg/$(ARCH64)/mpt.so.1
 file path=usr/lib/raidcfg/mpt.so.1
 file path=usr/lib/scsi/$(ARCH64)/libscsi.so.1
diff --git a/usr/src/test/test-runner/cmd/Makefile b/usr/src/test/test-runner/cmd/Makefile
index 33e7a61275..68acf3b23c 100644
--- a/usr/src/test/test-runner/cmd/Makefile
+++ b/usr/src/test/test-runner/cmd/Makefile
@@ -33,5 +33,5 @@ $(CMDS): $(ROOTBIN)
 $(ROOTBIN):
 	$(INS.dir)
 
-$(ROOTBIN)/%: %.py
-	$(INS.rename)
+$(ROOTBIN)/%: %
+	$(INS.pyfile)
diff --git a/usr/src/test/test-runner/cmd/run.py b/usr/src/test/test-runner/cmd/run
index 81e53b210f..ad0204d136 100644
--- a/usr/src/test/test-runner/cmd/run.py
+++ b/usr/src/test/test-runner/cmd/run
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 
 #
 # This file and its contents are supplied under the terms of the
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 22ff67aa3b..c8485b216a 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -96,11 +96,11 @@ ROOTDIRS= \
 	$(ROOTONBLD)/lib/$(MACH) \
 	$(ROOTONBLD)/lib/$(MACH)/64 \
 	$(ROOTONBLD)/lib/perl \
-	$(ROOTONBLD)/lib/python2.6 \
-	$(ROOTONBLD)/lib/python2.6/onbld \
-	$(ROOTONBLD)/lib/python2.6/onbld/Checks \
-	$(ROOTONBLD)/lib/python2.6/onbld/hgext \
-	$(ROOTONBLD)/lib/python2.6/onbld/Scm \
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION) \
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld \
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Checks \
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/hgext \
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Scm \
 	$(ROOTONBLD)/env \
 	$(ROOTONBLD)/etc \
 	$(ROOTONBLD)/etc/exception_lists \
@@ -148,7 +148,7 @@ $(ROOTDIRS):
 	$(INS.dir)
 
 $(ROOTONBLDLIBPY): $(ROOTDIRS)
-	$(RM) -r $@; $(SYMLINK) python2.6 $@
+	$(RM) -r $@; $(SYMLINK) python$(PYTHON_VERSION) $@
 
 make: ctf
 
diff --git a/usr/src/tools/Makefile.python b/usr/src/tools/Makefile.python
index dcf7c06360..147ef2b05c 100644
--- a/usr/src/tools/Makefile.python
+++ b/usr/src/tools/Makefile.python
@@ -63,34 +63,30 @@
 
 PYFILES = $(PYSRCS) $(PYOBJS)
 
-ROOTPYDIR_26 = $(PYTOPDIR)/python2.6/$(PYMODDIR)
-ROOTPYFILES_26	= $(PYFILES:%=$(ROOTPYDIR_26)/%)
+ROOTPYDIR = $(PYTOPDIR)/python$(PYTHON_VERSION)/$(PYMODDIR)
+ROOTPYFILES	= $(PYFILES:%=$(ROOTPYDIR)/%)
 
-ROOTPYFILES = $(ROOTPYFILES_26)
 $(ROOTPYFILES) := FILEMODE = 0444
 
-PYVERSDIRS = python2.6
+PYVERSDIRS = python$(PYTHON_VERSION)
 
-PY26OBJS = $(PYOBJS:%=python2.6/%)
-$(PY26OBJS) := PYTHON = $(PYTHON_26)
-
-PYVERSOBJS = $(PY26OBJS)
+PYVERSOBJS = $(PYOBJS:%=python$(PYTHON_VERSION)/%)
 
 CLOBBERFILES += $(PYVERSOBJS)
 CLOBBERDIRS += $(PYVERSDIRS)
 
 .KEEP_STATE:
 
-python2.6/%.pyc: %.py
+python$(PYTHON_VERSION)/%.pyc: %.py
 	@[ -d $(@D) ] || mkdir $(@D)
 	$(RM) $@
 	$(PYTHON) -mpy_compile $<
 	$(MV) $(*).pyc $@
 
-$(ROOTPYDIR_26)/%.pyc: python2.6/%.pyc
+$(ROOTPYDIR)/%.pyc: python$(PYTHON_VERSION)/%.pyc
 	$(INS.pyfile)
 
-$(ROOTPYDIR_26)/%.py: %.py
+$(ROOTPYDIR)/%.py: %.py
 	$(INS.pyfile)
 
 pyclobber:
diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools
index 78fe5f1d14..2b6cf225ca 100644
--- a/usr/src/tools/Makefile.tools
+++ b/usr/src/tools/Makefile.tools
@@ -39,7 +39,6 @@ ROOTONBLDLIBMACH=	$(ROOTONBLD)/lib/$(MACH)
 ROOTONBLDLIBMACH64=	$(ROOTONBLD)/lib/$(MACH)/64
 ROOTONBLDLIBPERL=	$(ROOTONBLD)/lib/perl
 ROOTONBLDLIBPY=		$(ROOTONBLD)/lib/python
-ROOTONBLDLIBPY_26=	$(ROOTONBLD)/lib/python2.6
 ROOTONBLDENV=		$(ROOTONBLD)/env
 ROOTONBLDGK=		$(ROOTONBLD)/gk
 ROOTONBLDMAN=		$(ROOTONBLD)/man
diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile
index 717147d8ad..935ebcf80c 100644
--- a/usr/src/tools/scripts/Makefile
+++ b/usr/src/tools/scripts/Makefile
@@ -116,7 +116,10 @@ EXCEPTFILES= \
 	interface_check \
 	interface_cmp
 
-CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1onbld
+CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1onbld onu.sh
+
+onu.sh:	onu.sh.in
+	$(SED) -e "s:@PYTHON_VERSION@:$(PYTHON_VERSION):g" < onu.sh.in > $@
 
 include ../Makefile.tools
 
diff --git a/usr/src/tools/scripts/cddlchk.py b/usr/src/tools/scripts/cddlchk.py
index 816d2f33a7..d0b3a70474 100644
--- a/usr/src/tools/scripts/cddlchk.py
+++ b/usr/src/tools/scripts/cddlchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/copyrightchk.py b/usr/src/tools/scripts/copyrightchk.py
index 210ef1b46c..8e6228f5f7 100644
--- a/usr/src/tools/scripts/copyrightchk.py
+++ b/usr/src/tools/scripts/copyrightchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py
index 8dea5a8785..9420812a21 100644
--- a/usr/src/tools/scripts/git-pbchk.py
+++ b/usr/src/tools/scripts/git-pbchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License version 2
diff --git a/usr/src/tools/scripts/hdrchk.py b/usr/src/tools/scripts/hdrchk.py
index 84acbc8616..8c529b8c3d 100644
--- a/usr/src/tools/scripts/hdrchk.py
+++ b/usr/src/tools/scripts/hdrchk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/hg-active.py b/usr/src/tools/scripts/hg-active.py
index 88394e98e5..495cdfc0db 100644
--- a/usr/src/tools/scripts/hg-active.py
+++ b/usr/src/tools/scripts/hg-active.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License version 2
diff --git a/usr/src/tools/scripts/mapfilechk.py b/usr/src/tools/scripts/mapfilechk.py
index 9cf2000c7a..0e3ba283a5 100644
--- a/usr/src/tools/scripts/mapfilechk.py
+++ b/usr/src/tools/scripts/mapfilechk.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/onu.sh b/usr/src/tools/scripts/onu.sh.in
index 53b0d85ce9..9a4e81e7a2 100644
--- a/usr/src/tools/scripts/onu.sh
+++ b/usr/src/tools/scripts/onu.sh.in
@@ -23,7 +23,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2010, Richard Lowe
-# 
+#
 
 PATH=/usr/bin:/usr/sbin
 export PATH
@@ -128,7 +128,7 @@ update_zone()
 
 	state=`echo $zone | cut -d: -f 3`
 
-	case "$state" in 
+	case "$state" in
 	configured|incomplete)
 		return
 		;;
@@ -208,7 +208,7 @@ if [ -n "$repodir" ]; then
 	[[ ! -e $cfgfile ]] && cfgfile=$redistdir/pkg5.repository
 	# need an absolute path
 	[[ $redistdir == /* ]] || redistdir=$PWD/$redistdir
-	redistpub=$(python2.6 <<# EOF
+	redistpub=$(python@PYTHON_VERSION@ <<# EOF
 		import ConfigParser
 		p = ConfigParser.SafeConfigParser()
 		p.read("$cfgfile")
diff --git a/usr/src/tools/scripts/validate_pkg.py b/usr/src/tools/scripts/validate_pkg.py
index 6678b211e8..6e5858a6ae 100644
--- a/usr/src/tools/scripts/validate_pkg.py
+++ b/usr/src/tools/scripts/validate_pkg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #
diff --git a/usr/src/tools/scripts/wsdiff.py b/usr/src/tools/scripts/wsdiff.py
index 27458f43fc..367903a190 100644
--- a/usr/src/tools/scripts/wsdiff.py
+++ b/usr/src/tools/scripts/wsdiff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!@PYTHON@
 #
 # CDDL HEADER START
 #