summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/Targetdirs8
-rw-r--r--usr/src/cmd/pyzfs/Makefile4
-rw-r--r--usr/src/cmd/pyzfs/pyzfs.py5
-rw-r--r--usr/src/lib/pysolaris/Makefile.com10
-rw-r--r--usr/src/lib/pysolaris/common/__init__.py5
-rw-r--r--usr/src/lib/pyzfs/Makefile.com10
-rw-r--r--usr/src/lib/pyzfs/common/__init__.py5
-rw-r--r--usr/src/lib/pyzfs/common/allow.py5
-rw-r--r--usr/src/lib/pyzfs/common/dataset.py5
-rw-r--r--usr/src/lib/pyzfs/common/groupspace.py5
-rw-r--r--usr/src/lib/pyzfs/common/holds.py5
-rw-r--r--usr/src/lib/pyzfs/common/table.py5
-rw-r--r--usr/src/lib/pyzfs/common/unallow.py5
-rw-r--r--usr/src/lib/pyzfs/common/userspace.py5
-rw-r--r--usr/src/lib/pyzfs/common/util.py5
-rw-r--r--usr/src/pkg/manifests/system-file-system-zfs.mf45
-rw-r--r--usr/src/pkg/manifests/system-library.mf13
17 files changed, 68 insertions, 77 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index a0a4016da6..592002817e 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -286,10 +286,10 @@ DIRS= \
/usr/net \
/usr/net/servers \
/usr/lib/pool \
- /usr/lib/python2.4 \
- /usr/lib/python2.4/vendor-packages \
- /usr/lib/python2.4/vendor-packages/solaris \
- /usr/lib/python2.4/vendor-packages/zfs \
+ /usr/lib/python2.6 \
+ /usr/lib/python2.6/vendor-packages \
+ /usr/lib/python2.6/vendor-packages/solaris \
+ /usr/lib/python2.6/vendor-packages/zfs \
/usr/lib/rcap \
/usr/lib/rcap/$(MACH32) \
/usr/lib/sa \
diff --git a/usr/src/cmd/pyzfs/Makefile b/usr/src/cmd/pyzfs/Makefile
index 062a97b019..65d3594902 100644
--- a/usr/src/cmd/pyzfs/Makefile
+++ b/usr/src/cmd/pyzfs/Makefile
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
include ../Makefile.cmd
@@ -31,6 +30,7 @@ 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 973ffc4dc1..2088993d6d 100644
--- a/usr/src/cmd/pyzfs/pyzfs.py
+++ b/usr/src/cmd/pyzfs/pyzfs.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4 -S
+#! /usr/bin/python2.6 -S
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Note, we want SIGINT (control-c) to exit the process quietly, to mimic
diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com
index f065560cff..6aae6f949a 100644
--- a/usr/src/lib/pysolaris/Makefile.com
+++ b/usr/src/lib/pysolaris/Makefile.com
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
LIBRARY = misc.a
@@ -33,18 +32,19 @@ include ../../Makefile.lib
LIBLINKS =
SRCDIR = ../common
-ROOTLIBDIR= $(ROOT)/usr/lib/python2.4/vendor-packages/solaris
+ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/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.4
+LDLIBS += -lc -lsec -lidmap -lpython2.6
CFLAGS += $(CCVERBOSE)
-CPPFLAGS += -I/usr/include/python2.4
+CPPFLAGS += -I/usr/include/python2.6
.KEEP_STATE:
diff --git a/usr/src/lib/pysolaris/common/__init__.py b/usr/src/lib/pysolaris/common/__init__.py
index ac2aad21b5..1119f0645a 100644
--- a/usr/src/lib/pysolaris/common/__init__.py
+++ b/usr/src/lib/pysolaris/common/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""
diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com
index dd23ae43d4..948ad13cc0 100644
--- a/usr/src/lib/pyzfs/Makefile.com
+++ b/usr/src/lib/pyzfs/Makefile.com
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
LIBRARY = ioctl.a
@@ -36,7 +35,8 @@ include ../../Makefile.lib
LIBLINKS =
SRCDIR = ../common
-ROOTLIBDIR= $(ROOT)/usr/lib/python2.4/vendor-packages/zfs
+ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages/zfs
+PYTHON= $(PYTHON_26)
PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc)
PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc)
ROOTPYZFSFILES= $(PYFILES:%=$(ROOTLIBDIR)/%)
@@ -45,9 +45,9 @@ C99MODE= -xc99=%all
C99LMODE= -Xc99=%all
LIBS = $(DYNLIB)
-LDLIBS += -lc -lnvpair -lpython2.4 -lzfs
+LDLIBS += -lc -lnvpair -lpython2.6 -lzfs
CFLAGS += $(CCVERBOSE)
-CPPFLAGS += -I/usr/include/python2.4
+CPPFLAGS += -I/usr/include/python2.6
CPPFLAGS += -I../../../uts/common/fs/zfs
CPPFLAGS += -I../../../common/zfs
diff --git a/usr/src/lib/pyzfs/common/__init__.py b/usr/src/lib/pyzfs/common/__init__.py
index f4b0f53954..76b0998a3e 100644
--- a/usr/src/lib/pyzfs/common/__init__.py
+++ b/usr/src/lib/pyzfs/common/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""
diff --git a/usr/src/lib/pyzfs/common/allow.py b/usr/src/lib/pyzfs/common/allow.py
index 1fa37e2c46..87e6f14b7d 100644
--- a/usr/src/lib/pyzfs/common/allow.py
+++ b/usr/src/lib/pyzfs/common/allow.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""This module implements the "zfs allow" and "zfs unallow" subcommands.
diff --git a/usr/src/lib/pyzfs/common/dataset.py b/usr/src/lib/pyzfs/common/dataset.py
index 3e8223bd95..26192e4075 100644
--- a/usr/src/lib/pyzfs/common/dataset.py
+++ b/usr/src/lib/pyzfs/common/dataset.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""Implements the Dataset class, providing methods for manipulating ZFS
diff --git a/usr/src/lib/pyzfs/common/groupspace.py b/usr/src/lib/pyzfs/common/groupspace.py
index 7db4bf3e0c..9f380fdb89 100644
--- a/usr/src/lib/pyzfs/common/groupspace.py
+++ b/usr/src/lib/pyzfs/common/groupspace.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
import zfs.userspace
diff --git a/usr/src/lib/pyzfs/common/holds.py b/usr/src/lib/pyzfs/common/holds.py
index a2ee38f4e8..800e28f974 100644
--- a/usr/src/lib/pyzfs/common/holds.py
+++ b/usr/src/lib/pyzfs/common/holds.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""This module implements the "zfs holds" subcommand.
diff --git a/usr/src/lib/pyzfs/common/table.py b/usr/src/lib/pyzfs/common/table.py
index a96d8d73e5..d2a45a142c 100644
--- a/usr/src/lib/pyzfs/common/table.py
+++ b/usr/src/lib/pyzfs/common/table.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
import zfs.util
diff --git a/usr/src/lib/pyzfs/common/unallow.py b/usr/src/lib/pyzfs/common/unallow.py
index 1458dc1328..cbdd4dd73f 100644
--- a/usr/src/lib/pyzfs/common/unallow.py
+++ b/usr/src/lib/pyzfs/common/unallow.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
import zfs.allow
diff --git a/usr/src/lib/pyzfs/common/userspace.py b/usr/src/lib/pyzfs/common/userspace.py
index 16a4f4cafb..8464f54b89 100644
--- a/usr/src/lib/pyzfs/common/userspace.py
+++ b/usr/src/lib/pyzfs/common/userspace.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""This module implements the "zfs userspace" and "zfs groupspace" subcommands.
diff --git a/usr/src/lib/pyzfs/common/util.py b/usr/src/lib/pyzfs/common/util.py
index 5ff8d0e751..a33c6693ee 100644
--- a/usr/src/lib/pyzfs/common/util.py
+++ b/usr/src/lib/pyzfs/common/util.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#! /usr/bin/python2.6
#
# CDDL HEADER START
#
@@ -19,8 +19,7 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
"""This module provides utility functions for ZFS.
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf
index 62bd13045d..d8f1292abd 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs.mf
@@ -64,9 +64,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.4
-dir path=usr/lib/python2.4/vendor-packages
-dir path=usr/lib/python2.4/vendor-packages/zfs
+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/sysevent
dir path=usr/lib/sysevent/modules
dir path=usr/lib/zfs
@@ -99,25 +99,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.4/vendor-packages/zfs/__init__.py
-file path=usr/lib/python2.4/vendor-packages/zfs/__init__.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/allow.py
-file path=usr/lib/python2.4/vendor-packages/zfs/allow.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/dataset.py
-file path=usr/lib/python2.4/vendor-packages/zfs/dataset.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/groupspace.py
-file path=usr/lib/python2.4/vendor-packages/zfs/groupspace.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/holds.py
-file path=usr/lib/python2.4/vendor-packages/zfs/holds.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/ioctl.so
-file path=usr/lib/python2.4/vendor-packages/zfs/table.py
-file path=usr/lib/python2.4/vendor-packages/zfs/table.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/unallow.py
-file path=usr/lib/python2.4/vendor-packages/zfs/unallow.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/userspace.py
-file path=usr/lib/python2.4/vendor-packages/zfs/userspace.pyc
-file path=usr/lib/python2.4/vendor-packages/zfs/util.py
-file path=usr/lib/python2.4/vendor-packages/zfs/util.pyc
+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/sysevent/modules/zfs_mod.so group=sys
file path=usr/lib/zfs/availdevs mode=0555
file path=usr/lib/zfs/pyzfs.py mode=0555
@@ -165,3 +165,4 @@ link path=usr/lib/llib-lzfs target=../../lib/llib-lzfs
link path=usr/lib/llib-lzfs.ln target=../../lib/llib-lzfs.ln
link path=usr/sbin/zfs target=../../sbin/zfs
link path=usr/sbin/zpool target=../../sbin/zpool
+depend fmri=runtime/python-26 type=require
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index dba34bfe6f..6918977859 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -54,9 +54,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.4
-dir path=usr/lib/python2.4/vendor-packages
-dir path=usr/lib/python2.4/vendor-packages/solaris
+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/raidcfg
dir path=usr/lib/raidcfg/$(ARCH64)
dir path=usr/lib/scsi
@@ -365,9 +365,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.4/vendor-packages/solaris/__init__.py
-file path=usr/lib/python2.4/vendor-packages/solaris/__init__.pyc
-file path=usr/lib/python2.4/vendor-packages/solaris/misc.so
+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/raidcfg/$(ARCH64)/mpt.so.1
file path=usr/lib/raidcfg/mpt.so.1
file path=usr/lib/scsi/$(ARCH64)/libscsi.so.1
@@ -1204,3 +1204,4 @@ $(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require
# a dependency which cannot be automatically derived
#
depend fmri=system/library/storage/scsi-plugins type=require
+depend fmri=runtime/python-26 type=require
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-03 11:37:42 +0000