diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-12 12:20:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-12 12:20:38 +0000 |
| commit | 7f81972ee25d8b65417a4f0b42124ba6e48616ac (patch) | |
| tree | 663d39c04c8740abe5a8179df2431930a52488c4 /usr/src/pkg | |
| parent | 8c6284f26f84d01dcbb0f93a15e9cf0da38c36de (diff) | |
| parent | 868e1ac07011f1f9626a73a411c31ebbdd462e3d (diff) | |
| download | illumos-joyent-7f81972ee25d8b65417a4f0b42124ba6e48616ac.tar.gz | |
[illumos-gate merge]
commit 868e1ac07011f1f9626a73a411c31ebbdd462e3d
12554 want sdev plugin framework (fix header issue)
commit b237158d576c3f39f35d97c4dd214c07273ddde4
12674 want mac rx barrier function
commit b939b187ee16d21b506005807c652e2c7bdfe243
12645 vds: smatch and NULL pointer errors
commit f8927fa6636832af96f657f29571bdbd213c6247
12554 want sdev plugin framework
commit 725953abcc30bcf6f15d7b8a313ab0749275d95f
12610 rmcadm: NULL pointer errors
commit cb453c7ae4b42ac7a2d7ce155181572a96d69b33
12650 ds: smatch and NULL pointer errors
commit 29368e865707707ba77989693d34358ebfa08757
12644 vdc: NULL pointer errors
commit 59b05390e07c3b0e69288f9a732dc5b90d464721
12539 mdb: NULL pointer errors
commit 8124b8119d8ab7f80f1bd8b094cd96356f531b54
12597 want libutempter
commit c8907381b10259bed3a871a2881c0f3b7287ab3c
12705 remove __builtin_alloca() declaration from string.h
Conflicts:
usr/src/uts/common/sys/mac_impl.h
usr/src/uts/common/sys/Makefile
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/system-header.mf | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-library-libutempter.mf | 44 |
2 files changed, 45 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 5b1da26c58..c95634b16c 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -1027,6 +1027,7 @@ file path=usr/include/sys/fs/pc_label.h file path=usr/include/sys/fs/pc_node.h file path=usr/include/sys/fs/pxfs_ki.h file path=usr/include/sys/fs/sdev_impl.h +file path=usr/include/sys/fs/sdev_plugin.h file path=usr/include/sys/fs/snode.h file path=usr/include/sys/fs/swapnode.h file path=usr/include/sys/fs/tmp.h diff --git a/usr/src/pkg/manifests/system-library-libutempter.mf b/usr/src/pkg/manifests/system-library-libutempter.mf new file mode 100644 index 0000000000..e883545383 --- /dev/null +++ b/usr/src/pkg/manifests/system-library-libutempter.mf @@ -0,0 +1,44 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +set name=pkg.fmri value=pkg:/system/library/libutempter@$(PKGVERS) +set name=pkg.description \ + value="Interface to record user sessions in utmpx database" +set name=pkg.summary \ + value="Interface to record user sessions in utmpx database" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Library +set name=variant.arch value=$(ARCH) +dir path=usr group=sys +dir path=usr/include +dir path=usr/lib +dir path=usr/lib/$(ARCH64) +dir path=usr/share +dir path=usr/share/man +dir path=usr/share/man/man3utempter +file path=usr/include/utempter.h +file path=usr/lib/$(ARCH64)/libutempter.so.1 +file path=usr/lib/libutempter.so.1 +file path=usr/share/man/man3utempter/utempter_add_record.3utempter +license usr/src/lib/libutempter/THIRDPARTYLICENSE \ + license=usr/src/lib/libutempter/THIRDPARTYLICENSE +link path=usr/lib/$(ARCH64)/libutempter.so target=libutempter.so.1 +link path=usr/lib/libutempter.so target=libutempter.so.1 +link path=usr/share/man/man3utempter/addToUtmp.3utempter \ + target=utempter_add_record.3utempter +link path=usr/share/man/man3utempter/removeFromUtmp.3utempter \ + target=utempter_add_record.3utempter +link path=usr/share/man/man3utempter/removeLineFromUtmp.3utempter \ + target=utempter_add_record.3utempter +link path=usr/share/man/man3utempter/utempter_remove_added_record.3utempter \ + target=utempter_add_record.3utempter +link path=usr/share/man/man3utempter/utempter_remove_record.3utempter \ + target=utempter_add_record.3utempter |