diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-30 11:52:23 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-03-30 11:52:23 +0000 |
| commit | bd19d8b090ef1603383da1841f3409435a022b27 (patch) | |
| tree | 57d632202762d9d42013da59565bdce0ea73df34 /usr/src/pkg | |
| parent | 8005dd7c9acaac2b9b39100ae7f9b99f478caf80 (diff) | |
| parent | 32991bedc3a6475f1401855c2318ae5b15f8a16b (diff) | |
| download | illumos-joyent-bd19d8b090ef1603383da1841f3409435a022b27.tar.gz | |
[illumos-gate merge]
commit 32991bedc3a6475f1401855c2318ae5b15f8a16b
5188 SVR4 packaging shouldn't depend on openssl or libwanboot
commit 4383d9578c9d399b19edc33e552a4c543ebf9468
5865 snoop prints timestamps oddly
commit 708dafbf52fa04021b9471a3582eaf6586ed6931
6516 pkgadm shouldn't use makeuuid from closed admin consolidation
commit 01876d1223927426d21f8a38ec514cc3803e9b0f
6297 share_nfs(1m): An obsolete paragraph in the man page
Conflicts:
usr/src/lib/libpkg/Makefile.com
usr/src/cmd/svr4pkg/pkgadm/Makefile
usr/src/cmd/svr4pkg/pkgadd/Makefile
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/package-svr4.mf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/usr/src/pkg/manifests/package-svr4.mf b/usr/src/pkg/manifests/package-svr4.mf index 5476930ec4..65e255b17f 100644 --- a/usr/src/pkg/manifests/package-svr4.mf +++ b/usr/src/pkg/manifests/package-svr4.mf @@ -118,6 +118,4 @@ legacy pkg=SUNWpkgcmdsu \ license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license usr/src/lib/libpkg/THIRDPARTYLICENSE \ - license=usr/src/lib/libpkg/THIRDPARTYLICENSE link path=usr/lib/libpkg.so target=./libpkg.so.1 |