diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 12:46:03 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-10 12:46:03 +0000 |
| commit | 78121a0c3d633d344c4092336d357036c0e19f96 (patch) | |
| tree | c6691bd7e380d723ada73f9b61dc4ef7634ee081 /usr/src/Targetdirs | |
| parent | 471ea867225b8c01fb430e738f6cf835294c99fc (diff) | |
| parent | 19ee9cd1f5161e227951200cab5ecbff45fd5d71 (diff) | |
| download | illumos-joyent-78121a0c3d633d344c4092336d357036c0e19f96.tar.gz | |
[illumos-gate merge]
commit 19ee9cd1f5161e227951200cab5ecbff45fd5d71
12277 /proc/<PID>/fdinfo should resolve paths relative to current process
commit 52aec5b9758f6352670ab269980b437a987f4822
12276 smatch-clean sockfs
commit 0dfe541e13279d277d838d6a27e55188b9486cb1
11083 support NFS server in zone
commit d8ab6e129d75d7c3f21a7909bf811a3de65faea8
12235 Add libzutil for libzfs or libzpool consumers
commit fdefee4c75361dc5ea202f7e1f7c49f8a27ea043
12266 loader: rewrite zfs reader zap code to use malloc
commit 8af765f5897d30449b941438e8d833f02dac74f8
12252 remove sunfire-specific code from kstat(1m)
commit 34173ec8d0147391124bee4bbc60ac00807c0377
12284 errors in compress(1) and pack(1) man pages
Conflicts:
usr/src/uts/common/klm/nlm_impl.h
usr/src/uts/common/fs/nfs/nfs_server.c
usr/src/lib/Makefile
usr/src/cmd/fs.d/nfs/svc/nfs-server
Diffstat (limited to 'usr/src/Targetdirs')
| -rw-r--r-- | usr/src/Targetdirs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index bb212bbeec..699a2b8dc9 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -30,6 +30,7 @@ # Copyright 2017 RackTop Systems. # Copyright 2019 Joyent, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2020 Joyent, Inc. # # @@ -926,6 +927,8 @@ $(ROOT)/usr/lib/libzfs.so.1:= REALPATH=../../lib/libzfs.so.1 $(ROOT)/usr/lib/libzfs.so:= REALPATH=../../lib/libzfs.so.1 $(ROOT)/usr/lib/libzfs_core.so.1:= REALPATH=../../lib/libzfs_core.so.1 $(ROOT)/usr/lib/libzfs_core.so:= REALPATH=../../lib/libzfs_core.so.1 +$(ROOT)/usr/lib/libzutil.so.1:= REALPATH=../../lib/libzutil.so.1 +$(ROOT)/usr/lib/libzutil.so:= REALPATH=../../lib/libzutil.so.1 $(ROOT)/usr/lib/nss_compat.so.1:= REALPATH=../../lib/nss_compat.so.1 $(ROOT)/usr/lib/nss_dns.so.1:= REALPATH=../../lib/nss_dns.so.1 $(ROOT)/usr/lib/nss_files.so.1:= REALPATH=../../lib/nss_files.so.1 @@ -1194,6 +1197,10 @@ $(ROOT)/usr/lib/$(MACH64)/libzfs_core.so:= \ REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1 $(ROOT)/usr/lib/$(MACH64)/libzfs_core.so.1:= \ REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1 +$(ROOT)/usr/lib/$(MACH64)/libzutil.so:= \ + REALPATH=../../../lib/$(MACH64)/libzutil.so.1 +$(ROOT)/usr/lib/$(MACH64)/libzutil.so.1:= \ + REALPATH=../../../lib/$(MACH64)/libzutil.so.1 $(ROOT)/usr/lib/$(MACH64)/libfakekernel.so:= \ REALPATH=../../../lib/$(MACH64)/libfakekernel.so.1 $(ROOT)/usr/lib/$(MACH64)/libfakekernel.so.1:= \ @@ -1357,6 +1364,8 @@ SYM.USRLIB= \ /usr/lib/libzfs.so.1 \ /usr/lib/libzfs_core.so \ /usr/lib/libzfs_core.so.1 \ + /usr/lib/libzutil.so \ + /usr/lib/libzutil.so.1 \ /usr/lib/nss_compat.so.1 \ /usr/lib/nss_dns.so.1 \ /usr/lib/nss_files.so.1 \ @@ -1506,6 +1515,8 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/libzfs.so.1 \ /usr/lib/$(MACH64)/libzfs_core.so \ /usr/lib/$(MACH64)/libzfs_core.so.1 \ + /usr/lib/$(MACH64)/libzutil.so \ + /usr/lib/$(MACH64)/libzutil.so.1 \ /usr/lib/$(MACH64)/nss_compat.so.1 \ /usr/lib/$(MACH64)/nss_dns.so.1 \ /usr/lib/$(MACH64)/nss_files.so.1 \ |