diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2016-08-30 12:55:15 +0300 |
|---|---|---|
| committer | Gordon Ross <gordon.w.ross@gmail.com> | 2016-09-29 22:49:32 -0400 |
| commit | 9f9230833b50b8271840dc2c12bd1e94d9df7d12 (patch) | |
| tree | d674face6d7ae05e652e1ffeed7c0ce37cc32f86 /usr/src/lib/pyzfs | |
| parent | 8ae05c101a3c849364fa53a66ec87aa59823326a (diff) | |
| download | illumos-joyent-9f9230833b50b8271840dc2c12bd1e94d9df7d12.tar.gz | |
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>
Diffstat (limited to 'usr/src/lib/pyzfs')
| -rw-r--r-- | usr/src/lib/pyzfs/Makefile.com | 10 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/__init__.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/allow.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/dataset.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/groupspace.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/holds.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/table.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/unallow.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/userspace.py | 2 | ||||
| -rw-r--r-- | usr/src/lib/pyzfs/common/util.py | 2 |
10 files changed, 15 insertions, 13 deletions
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 # |