diff options
Diffstat (limited to 'usr/src/pkg/manifests/system-file-system-zfs.mf')
| -rw-r--r-- | usr/src/pkg/manifests/system-file-system-zfs.mf | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf index 7a2e44ed8b..69f9c71fcc 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs.mf @@ -23,6 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, 2017 by Delphix. All rights reserved. # Copyright (c) 2013 by Saso Kiselkov. All rights reserved. +# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/file-system/zfs@$(PKGVERS) @@ -30,12 +31,6 @@ set name=pkg.description value="ZFS libraries and commands" set name=pkg.summary value=ZFS set name=info.classification \ value="org.opensolaris.category.2008:System/File System" - -# -# Skip manifest generation until build 134 can be required on the -# build systems, due to a Python flavor identification bug in pkgdepend. -# -set name=org.opensolaris.nodepend value=true set name=variant.arch value=$(ARCH) dir path=etc group=sys dir path=etc/fs group=sys @@ -66,9 +61,6 @@ 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/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 @@ -105,25 +97,6 @@ $(i386_ONLY)file path=usr/lib/libzpool.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/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/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 @@ -184,4 +157,7 @@ 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$(PYTHON_PKGVERS) type=require +$(python3_ONLY)depend fmri=system/library/python/zfs$(PYTHON3_PKGVERS) \ + predicate=runtime/python$(PYTHON3_PKGVERS) type=conditional +$(python2_ONLY)depend fmri=system/library/python/zfs$(PYTHON_PKGVERS) \ + predicate=runtime/python$(PYTHON_PKGVERS) type=conditional |