diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-08 11:35:01 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-08 11:35:01 +0000 |
| commit | b97f5b09ef2e4af27e3cc4addd8abe5fc7c4d817 (patch) | |
| tree | 26a516b2251314578cd471a7293f6d36cdd798a8 /usr/src/pkg | |
| parent | 500c01a56730addd2b2a8a00fef7ce205769f05a (diff) | |
| parent | f4f9009fc79529ef8f45e7a31acd2ce4ca86a276 (diff) | |
| download | illumos-joyent-b97f5b09ef2e4af27e3cc4addd8abe5fc7c4d817.tar.gz | |
[illumos-gate merge]
commit f4f9009fc79529ef8f45e7a31acd2ce4ca86a276
12912 epoll mishandles excessive timeout negativity
commit be9c3adb90f4f745cf5c07f3c0dbdd6c9028cda0
12926 libstand: add missing iscntrl() isgraph() and ispunct()
commit 7ac89354c798225fea6296348415955ccd95fb80
12877 Port OpenZFS #7780 - Add basic zfs ioc input nvpair validation
12895 zfs_onexit_fd_hold fails to release non-zfs fds
commit 6f0673af8764c356a5bd511fc7ca8af579fe2000
12810 usr/src/tools/opensolaris contents are unused
commit 086d96878f5f62a25a6d90e5b03a1ef9ba352231
12909 epoll should better detect fd reassignment
Conflicts:
usr/src/uts/common/sys/user.h
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/README.pkg | 5 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-test-zfstest.mf | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg index 9c4d86ad3f..1910c3adeb 100644 --- a/usr/src/pkg/README.pkg +++ b/usr/src/pkg/README.pkg @@ -442,10 +442,7 @@ The following actions are required for all packages in ON. in /usr/share/package-manager/data/opensolaris.org.sections. license - All packages must specify a set of license actions. If - you're adding items here that are not already included in - usr/src/pkg/license_files, then you will also need to modify - usr/src/tools/opensolaris/license-list. + All packages must specify a set of license actions. You don't need to set the following. They're taken care of for all OS/Net packages in the transforms/common_actions file. diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index 9f78c29bb5..f4b2dca8d8 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -192,6 +192,7 @@ file path=opt/zfs-tests/bin/file_write mode=0555 file path=opt/zfs-tests/bin/getholes mode=0555 file path=opt/zfs-tests/bin/has_unmap mode=0555 file path=opt/zfs-tests/bin/largest_file mode=0555 +file path=opt/zfs-tests/bin/libzfs_input_check mode=0555 file path=opt/zfs-tests/bin/memory_balloon mode=0555 file path=opt/zfs-tests/bin/mkbusy mode=0555 file path=opt/zfs-tests/bin/mkfiles mode=0555 @@ -2604,7 +2605,10 @@ file path=opt/zfs-tests/tests/functional/largest_pool/largest_pool.cfg \ mode=0444 file path=opt/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos \ mode=0555 +file path=opt/zfs-tests/tests/functional/libzfs/cleanup mode=0555 +file path=opt/zfs-tests/tests/functional/libzfs/libzfs_input mode=0555 file path=opt/zfs-tests/tests/functional/libzfs/many_fds mode=0555 +file path=opt/zfs-tests/tests/functional/libzfs/setup mode=0555 file path=opt/zfs-tests/tests/functional/link_count/cleanup mode=0555 file path=opt/zfs-tests/tests/functional/link_count/link_count_001 mode=0555 file path=opt/zfs-tests/tests/functional/link_count/setup mode=0555 |