diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-07-19 11:24:20 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-07-19 11:24:20 -0400 |
| commit | 56c7f1a1c7ca3aef7200fe9d148633070f0908dc (patch) | |
| tree | 31807a50598560c84fe979887f3b14ecf8eb7d40 /usr/src/pkg/manifests/system-file-system-zfs.p5m | |
| parent | 81f8ded9e0469715043eb450f73e96578cb80240 (diff) | |
| parent | 708bde8c8780e5414779e4d9e7a7648886a4700e (diff) | |
| download | illumos-joyent-OS-8397.tar.gz | |
[illumos-gate merge]OS-8397
commit 708bde8c8780e5414779e4d9e7a7648886a4700e
14786 remove packaging support for SPARC
commit 70143b9fb6146f632b4b5d924e508df293b600df
14769 remove support for Python 2.x
Conflicts:
manifest
usr/src/cmd/mdb/Makefile.module
usr/src/tools/onbld/Checks/DbLookups.py
Diffstat (limited to 'usr/src/pkg/manifests/system-file-system-zfs.p5m')
| -rw-r--r-- | usr/src/pkg/manifests/system-file-system-zfs.p5m | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.p5m b/usr/src/pkg/manifests/system-file-system-zfs.p5m index afe1c20709..0623fe917a 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.p5m +++ b/usr/src/pkg/manifests/system-file-system-zfs.p5m @@ -119,8 +119,7 @@ dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555 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/mdb/proc/$(ARCH64) 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 dir path=usr/lib/sysevent @@ -153,9 +152,5 @@ license usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash \ license=usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash license usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 \ license=usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 -$(python3_ONLY)depend type=conditional \ - fmri=system/library/python/zfs$(PYTHON3_PKGVERS) \ +depend type=conditional fmri=system/library/python/zfs$(PYTHON3_PKGVERS) \ predicate=runtime/python$(PYTHON3_PKGVERS) -$(python2_ONLY)depend type=conditional \ - fmri=system/library/python/zfs$(PYTHON_PKGVERS) \ - predicate=runtime/python$(PYTHON_PKGVERS) |