diff options
| author | John Levon <john.levon@joyent.com> | 2020-08-13 15:27:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 15:27:11 +0100 |
| commit | e63d036fd36b5642d5e199f7d9895d8d4eda6072 (patch) | |
| tree | 0c177a62e8bd3796a7b530b7520fb0a4e7d0cd56 /usr/src/pkg/manifests | |
| parent | a8ff5009e5f7ea544c79b60ea65577f19304ff0b (diff) | |
| parent | 09f210323354e07890b312da9b4f5e33ae6b6df5 (diff) | |
| download | illumos-joyent-sasinfo.tar.gz | |
Merge branch 'master' into sasinfosasinfo
Diffstat (limited to 'usr/src/pkg/manifests')
| -rw-r--r-- | usr/src/pkg/manifests/system-library.man3lib.inc | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-library.mf | 2 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-test-zfstest.mf | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/pkg/manifests/system-library.man3lib.inc b/usr/src/pkg/manifests/system-library.man3lib.inc index bf60cd2b7a..750b223713 100644 --- a/usr/src/pkg/manifests/system-library.man3lib.inc +++ b/usr/src/pkg/manifests/system-library.man3lib.inc @@ -74,7 +74,6 @@ file path=usr/share/man/man3lib/libsecdb.3lib file path=usr/share/man/man3lib/libsendfile.3lib file path=usr/share/man/man3lib/libsip.3lib file path=usr/share/man/man3lib/libsocket.3lib -file path=usr/share/man/man3lib/libsys.3lib file path=usr/share/man/man3lib/libsysevent.3lib file path=usr/share/man/man3lib/libthread.3lib file path=usr/share/man/man3lib/libtsnet.3lib diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf index 6ae9fc7378..1ab189080b 100644 --- a/usr/src/pkg/manifests/system-library.mf +++ b/usr/src/pkg/manifests/system-library.mf @@ -467,7 +467,6 @@ file path=usr/lib/libsldap.so.1 file path=usr/lib/libsmbios.so.1 file path=usr/lib/libsoftcrypto.so.1 file path=usr/lib/libsum.so.1 -file path=usr/lib/libsys.so.1 $(sparc_ONLY)file path=usr/lib/libv12n.so.1 file path=usr/lib/libvolmgt.so.1 file path=usr/lib/libwrap.so.1.0 @@ -1209,7 +1208,6 @@ link path=usr/lib/libsmbios.so target=libsmbios.so.1 link path=usr/lib/libsocket.so target=../../lib/libsocket.so.1 link path=usr/lib/libsocket.so.1 target=../../lib/libsocket.so.1 link path=usr/lib/libsoftcrypto.so target=./libsoftcrypto.so.1 -link path=usr/lib/libsys.so target=./libsys.so.1 link path=usr/lib/libsysevent.so target=../../lib/libsysevent.so.1 link path=usr/lib/libsysevent.so.1 target=../../lib/libsysevent.so.1 link path=usr/lib/libtermcap.so target=../../lib/libtermcap.so.1 diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 662050d421..51a81cbc04 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -1893,6 +1893,12 @@ file \ file \ path=opt/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported \ mode=0555 +file \ + path=opt/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_removed \ + mode=0555 +file \ + path=opt/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_valid \ + mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_offline/cleanup \ mode=0555 file path=opt/zfs-tests/tests/functional/cli_root/zpool_offline/setup \ |