Mercurial > illumos > illumos-gate
changeset 12973:f0448f1d899f
6908227 pyzfs needs to move to python 2.6
| author | Lori Alt <lori.alt@oracle.com> |
|---|---|
| date | Thu, 29 Jul 2010 15:41:34 -0600 |
| parents | daef03a98f12 |
| children | 468ace4afeec |
| files | usr/src/Targetdirs usr/src/cmd/pyzfs/Makefile usr/src/cmd/pyzfs/pyzfs.py usr/src/lib/pysolaris/Makefile.com usr/src/lib/pysolaris/common/__init__.py usr/src/lib/pyzfs/Makefile.com usr/src/lib/pyzfs/common/__init__.py usr/src/lib/pyzfs/common/allow.py usr/src/lib/pyzfs/common/dataset.py usr/src/lib/pyzfs/common/groupspace.py usr/src/lib/pyzfs/common/holds.py usr/src/lib/pyzfs/common/table.py usr/src/lib/pyzfs/common/unallow.py usr/src/lib/pyzfs/common/userspace.py usr/src/lib/pyzfs/common/util.py usr/src/pkg/manifests/system-file-system-zfs.mf usr/src/pkg/manifests/system-library.mf |
| diffstat | 17 files changed, 68 insertions(+), 77 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Targetdirs Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/Targetdirs Thu Jul 29 15:41:34 2010 -0600 @@ -286,10 +286,10 @@ /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 \
--- a/usr/src/cmd/pyzfs/Makefile Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/cmd/pyzfs/Makefile Thu Jul 29 15:41:34 2010 -0600 @@ -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 @@ PYOBJS= $(PYSRCS:%.py=%.pyc) PYFILES= $(PYSRCS) $(PYOBJS) POFILE= pyzfs.po +PYTHON= $(PYTHON_26) ROOTLIBZFSFILES= $(PYFILES:%=$(ROOTLIB)/zfs/%)
--- a/usr/src/cmd/pyzfs/pyzfs.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/cmd/pyzfs/pyzfs.py Thu Jul 29 15:41:34 2010 -0600 @@ -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
--- a/usr/src/lib/pysolaris/Makefile.com Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pysolaris/Makefile.com Thu Jul 29 15:41:34 2010 -0600 @@ -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 @@ 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:
--- a/usr/src/lib/pysolaris/common/__init__.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pysolaris/common/__init__.py Thu Jul 29 15:41:34 2010 -0600 @@ -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. # """
--- a/usr/src/lib/pyzfs/Makefile.com Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/Makefile.com Thu Jul 29 15:41:34 2010 -0600 @@ -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 @@ 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 @@ 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
--- a/usr/src/lib/pyzfs/common/__init__.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/__init__.py Thu Jul 29 15:41:34 2010 -0600 @@ -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. # """
--- a/usr/src/lib/pyzfs/common/allow.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/allow.py Thu Jul 29 15:41:34 2010 -0600 @@ -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.
--- a/usr/src/lib/pyzfs/common/dataset.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/dataset.py Thu Jul 29 15:41:34 2010 -0600 @@ -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
--- a/usr/src/lib/pyzfs/common/groupspace.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/groupspace.py Thu Jul 29 15:41:34 2010 -0600 @@ -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
--- a/usr/src/lib/pyzfs/common/holds.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/holds.py Thu Jul 29 15:41:34 2010 -0600 @@ -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.
--- a/usr/src/lib/pyzfs/common/table.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/table.py Thu Jul 29 15:41:34 2010 -0600 @@ -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
--- a/usr/src/lib/pyzfs/common/unallow.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/unallow.py Thu Jul 29 15:41:34 2010 -0600 @@ -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
--- a/usr/src/lib/pyzfs/common/userspace.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/userspace.py Thu Jul 29 15:41:34 2010 -0600 @@ -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.
--- a/usr/src/lib/pyzfs/common/util.py Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/lib/pyzfs/common/util.py Thu Jul 29 15:41:34 2010 -0600 @@ -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.
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/pkg/manifests/system-file-system-zfs.mf Thu Jul 29 15:41:34 2010 -0600 @@ -64,9 +64,9 @@ 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 @@ $(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.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
--- a/usr/src/pkg/manifests/system-library.mf Thu Jul 29 13:50:45 2010 -0700 +++ b/usr/src/pkg/manifests/system-library.mf Thu Jul 29 15:41:34 2010 -0600 @@ -54,9 +54,9 @@ $(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/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 @@ # a dependency which cannot be automatically derived # depend fmri=system/library/storage/scsi-plugins type=require +depend fmri=runtime/python-26 type=require