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/lib/Makefile | |
| 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/lib/Makefile')
| -rw-r--r-- | usr/src/lib/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 3ea7f02985..5a89beb017 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -22,7 +22,7 @@ # # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012 by Delphix. All rights reserved. -# Copyright 2019, Joyent, Inc. +# Copyright 2020 Joyent, Inc. # Copyright (c) 2013 Gary Mills # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright (c) 2015 Gary Mills @@ -258,6 +258,7 @@ SUBDIRS += \ libzoneinfo \ libzonestat \ libzpool \ + libzutil \ madv \ mpapi \ mpss \ @@ -713,14 +714,15 @@ libvolmgt: libadm libvrrpadm: libdladm libscf libvscan: libscf libsecdb libzdoor: libc libzonecfg libcontract -libzfs: libdevid libgen libuutil libadm libavl libefi libidmap \ - libumem libtsol libzfs_core libcryptoutil pkcs11 libmd libcmdutils +libzfs: libdevid libgen libuutil libavl libefi libidmap \ + libumem libtsol libzfs_core libcryptoutil pkcs11 libmd libzutil libzfs_core: libnvpair -libzfs_jni: libdiskmgt libzfs +libzfs_jni: libdiskmgt libzfs libzutil libzonecfg: libuuid libsysevent libsec libbrand libpool libscf libproc \ libuutil libbsm libsecdb libzonestat: libcmdutils libumem -libzpool: libavl libumem libcmdutils libsysevent libfakekernel libzfs +libzpool: libavl libumem libcmdutils libsysevent libfakekernel libzutil +libzutil: libadm libavl libdevid libefi madv: libgen mpapi: libpthread libdevinfo libsysevent mpss: libgen |