summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-09-27 09:24:29 +0000
committermartin <martin@NetBSD.org>2019-09-27 09:24:29 +0000
commita7936de3d07f4d886e0769b4fa431db49522efef (patch)
tree21bc017d4e4fa602658b575effab8a06f7a4adf5
parenta2855c8d87ba88d6eabdf9eb502c4882cb432de5 (diff)
Pull up following revision(s) (requested by brad in ticket #252):
external/cddl/osnet/lib/libzpool/Makefile: revision 1.13 lib/libpthread/Makefile: revision 1.95 external/cddl/osnet/lib/libuutil/Makefile: revision 1.6 distrib/sets/lists/base/shl.mi: revision 1.871 external/cddl/osnet/lib/libzfs_core/Makefile: revision 1.2 external/cddl/osnet/lib/libnvpair/Makefile: revision 1.11 external/cddl/osnet/lib/libzfs/Makefile: revision 1.10 external/cddl/osnet/lib/libavl/Makefile: revision 1.6 distrib/sets/lists/debug/shl.mi: revision 1.230 external/cddl/osnet/lib/libumem/Makefile: revision 1.7 Add USE_SHLIBDIR=yes to a number of Makefiles for the libraries used by /sbin/{zfs,zpool,mount_zfs}. The general effect is to move them from /usr/lib to /lib. Compatibility links are installed in /usr/lib and nothing that is installed, say in /usr/pkg, appears to break. With this, it is possible to have a /var and /usr mount using ZFS legacy mounting early on in the boot process. Run tested on amd64 and i386 and compile tested on evbarm. Fix MKDEBUG distrib sets Add libpthread, libnvpair and ZFS libs to dynamicroot.
-rw-r--r--distrib/sets/lists/base/shl.mi26
-rw-r--r--distrib/sets/lists/debug/shl.mi10
-rw-r--r--external/cddl/osnet/lib/libavl/Makefile4
-rw-r--r--external/cddl/osnet/lib/libnvpair/Makefile4
-rw-r--r--external/cddl/osnet/lib/libumem/Makefile4
-rw-r--r--external/cddl/osnet/lib/libuutil/Makefile5
-rw-r--r--external/cddl/osnet/lib/libzfs/Makefile4
-rw-r--r--external/cddl/osnet/lib/libzfs_core/Makefile4
-rw-r--r--external/cddl/osnet/lib/libzpool/Makefile4
-rw-r--r--lib/libpthread/Makefile4
10 files changed, 59 insertions, 10 deletions
diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi
index d829b271103..f60fa2083a9 100644
--- a/distrib/sets/lists/base/shl.mi
+++ b/distrib/sets/lists/base/shl.mi
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.866.2.2 2019/09/12 19:17:57 martin Exp $
+# $NetBSD: shl.mi,v 1.866.2.3 2019/09/27 09:24:30 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -13,6 +13,9 @@
#
# Note: libtermcap and libtermlib are hardlinked and share the same version.
#
+./lib/libavl.so base-zfs-shlib dynamicroot,zfs
+./lib/libavl.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libavl.so.0.0 base-zfs-shlib dynamicroot,zfs
./lib/libblacklist.so base-sys-shlib dynamicroot
./lib/libblacklist.so.0 base-sys-shlib dynamicroot
./lib/libblacklist.so.0.0 base-sys-shlib dynamicroot
@@ -60,6 +63,9 @@
./lib/libnpf.so base-npf-shlib dynamicroot,npf
./lib/libnpf.so.0 base-npf-shlib dynamicroot,npf
./lib/libnpf.so.0.1 base-npf-shlib dynamicroot,npf
+./lib/libnvpair.so base-zfs-shlib dynamicroot,zfs
+./lib/libnvpair.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libnvpair.so.0.0 base-zfs-shlib dynamicroot,zfs
./lib/libpcap.so base-sys-shlib dynamicroot
./lib/libpcap.so.7 base-sys-shlib dynamicroot
./lib/libpcap.so.7.0 base-sys-shlib dynamicroot
@@ -69,6 +75,9 @@
./lib/libprop.so base-sys-shlib dynamicroot
./lib/libprop.so.1 base-sys-shlib dynamicroot
./lib/libprop.so.1.1 base-sys-shlib dynamicroot
+./lib/libpthread.so base-sys-shlib dynamicroot
+./lib/libpthread.so.1 base-sys-shlib dynamicroot
+./lib/libpthread.so.1.4 base-sys-shlib dynamicroot
./lib/libradius.so base-sys-shlib dynamicroot
./lib/libradius.so.4 base-sys-shlib dynamicroot
./lib/libradius.so.4.0 base-sys-shlib dynamicroot
@@ -87,12 +96,27 @@
./lib/libtermlib.so base-sys-shlib dynamicroot
./lib/libtermlib.so.0 base-sys-shlib dynamicroot
./lib/libtermlib.so.0.6 base-sys-shlib dynamicroot
+./lib/libumem.so base-zfs-shlib dynamicroot,zfs
+./lib/libumem.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libumem.so.0.0 base-zfs-shlib dynamicroot,zfs
./lib/libutil.so base-sys-shlib dynamicroot
./lib/libutil.so.7 base-sys-shlib dynamicroot
./lib/libutil.so.7.24 base-sys-shlib dynamicroot
+./lib/libuutil.so base-zfs-shlib dynamicroot,zfs
+./lib/libuutil.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libuutil.so.0.0 base-zfs-shlib dynamicroot,zfs
./lib/libz.so base-sys-shlib dynamicroot
./lib/libz.so.1 base-sys-shlib dynamicroot
./lib/libz.so.1.0 base-sys-shlib dynamicroot
+./lib/libzfs.so base-zfs-shlib dynamicroot,zfs
+./lib/libzfs.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libzfs.so.0.0 base-zfs-shlib dynamicroot,zfs
+./lib/libzfs_core.so base-zfs-shlib dynamicroot,zfs
+./lib/libzfs_core.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libzfs_core.so.0.0 base-zfs-shlib dynamicroot,zfs
+./lib/libzpool.so base-zfs-shlib dynamicroot,zfs
+./lib/libzpool.so.0 base-zfs-shlib dynamicroot,zfs
+./lib/libzpool.so.0.0 base-zfs-shlib dynamicroot,zfs
./lib/npf/ext_log.so base-npf-shlib compatfile,npf
./lib/npf/ext_log.so.0 base-npf-shlib compatfile,npf
./lib/npf/ext_log.so.0.0 base-npf-shlib compatfile,npf
diff --git a/distrib/sets/lists/debug/shl.mi b/distrib/sets/lists/debug/shl.mi
index e469d9d9612..5e7e50297c4 100644
--- a/distrib/sets/lists/debug/shl.mi
+++ b/distrib/sets/lists/debug/shl.mi
@@ -1,6 +1,7 @@
-# $NetBSD: shl.mi,v 1.225.2.1 2019/09/12 19:17:58 martin Exp $
+# $NetBSD: shl.mi,v 1.225.2.2 2019/09/27 09:24:30 martin Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
+./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libc.so.12.213.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot
@@ -17,16 +18,23 @@
./usr/libdata/debug/lib/liblzma.so.2.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libm.so.0.12.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libnpf.so.0.1.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libnvpair.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
./usr/libdata/debug/lib/libpcap.so.7.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libppath.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libprop.so.1.1.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libpthread.so.1.4.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libradius.so.4.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/librumpclient.so.0.0.debug comp-rump-debug debug,dynamicroot,rump
./usr/libdata/debug/lib/librumpres.so.0.0.debug comp-rump-debug debug,dynamicroot,rump
./usr/libdata/debug/lib/libterminfo.so.1.0.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libumem.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
./usr/libdata/debug/lib/libutil.so.7.23.debug comp-obsolete debug,obsolete,compatfile
./usr/libdata/debug/lib/libutil.so.7.24.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libuutil.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
./usr/libdata/debug/lib/libz.so.1.0.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libzfs.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
+./usr/libdata/debug/lib/libzfs_core.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
+./usr/libdata/debug/lib/libzpool.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
./usr/libdata/debug/lib/npf/ext_log.so.0.0.debug comp-sys-debug debug,compatfile,npf
./usr/libdata/debug/lib/npf/ext_normalize.so.0.0.debug comp-sys-debug debug,compatfile,npf
./usr/libdata/debug/lib/npf/ext_rndblock.so.0.0.debug comp-sys-debug debug,compatfile,npf
diff --git a/external/cddl/osnet/lib/libavl/Makefile b/external/cddl/osnet/lib/libavl/Makefile
index 5859e83b01f..ad9889d4917 100644
--- a/external/cddl/osnet/lib/libavl/Makefile
+++ b/external/cddl/osnet/lib/libavl/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
+# $NetBSD: Makefile,v 1.5.16.1 2019/09/27 09:24:30 martin Exp $
.include <bsd.init.mk>
+USE_SHLIBDIR= yes
+
.PATH: ${.CURDIR}/../../dist/common/avl
CPPFLAGS+=-Wall -Wno-unknown-pragmas
diff --git a/external/cddl/osnet/lib/libnvpair/Makefile b/external/cddl/osnet/lib/libnvpair/Makefile
index 12c2e483b03..35fd8140108 100644
--- a/external/cddl/osnet/lib/libnvpair/Makefile
+++ b/external/cddl/osnet/lib/libnvpair/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2019/06/04 08:45:17 hannken Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2019/09/27 09:24:30 martin Exp $
.include <bsd.init.mk>
+USE_SHLIBDIR= yes
+
.PATH: ${.CURDIR}/../../dist/lib/libnvpair
.PATH: ${.CURDIR}/../../dist/common/nvpair
diff --git a/external/cddl/osnet/lib/libumem/Makefile b/external/cddl/osnet/lib/libumem/Makefile
index d9aa3c84090..a00d2591fff 100644
--- a/external/cddl/osnet/lib/libumem/Makefile
+++ b/external/cddl/osnet/lib/libumem/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2016/08/04 17:07:24 christos Exp $
+# $NetBSD: Makefile,v 1.6.16.1 2019/09/27 09:24:30 martin Exp $
.include <bsd.init.mk>
+USE_SHLIBDIR= yes
+
LIB= umem
SRCS= umem.c
diff --git a/external/cddl/osnet/lib/libuutil/Makefile b/external/cddl/osnet/lib/libuutil/Makefile
index 2747e96bf37..c75c7a08543 100644
--- a/external/cddl/osnet/lib/libuutil/Makefile
+++ b/external/cddl/osnet/lib/libuutil/Makefile
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
+# $NetBSD: Makefile,v 1.5.16.1 2019/09/27 09:24:30 martin Exp $
.include <bsd.init.mk>
+
+USE_SHLIBDIR= yes
+
.PATH: ${.CURDIR}/../../dist/lib/libuutil/common
.PATH: ${.CURDIR}/../../dist/common/avl
diff --git a/external/cddl/osnet/lib/libzfs/Makefile b/external/cddl/osnet/lib/libzfs/Makefile
index 3e4e5c75471..4946126fa57 100644
--- a/external/cddl/osnet/lib/libzfs/Makefile
+++ b/external/cddl/osnet/lib/libzfs/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2018/05/28 21:05:09 chs Exp $
+# $NetBSD: Makefile,v 1.9.4.1 2019/09/27 09:24:30 martin Exp $
.include <bsd.init.mk>
+USE_SHLIBDIR= yes
+
.PATH: ${.CURDIR}/../../dist/common/zfs
.PATH: ${.CURDIR}/../../dist/common/fs/zfs
.PATH: ${.CURDIR}/../../dist/lib/libzfs/common
diff --git a/external/cddl/osnet/lib/libzfs_core/Makefile b/external/cddl/osnet/lib/libzfs_core/Makefile
index fdd8f351b10..a28199080c4 100644
--- a/external/cddl/osnet/lib/libzfs_core/Makefile
+++ b/external/cddl/osnet/lib/libzfs_core/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/05/28 23:47:40 chs Exp $
+# $NetBSD: Makefile,v 1.1.6.1 2019/09/27 09:24:30 martin Exp $
.include <bsd.init.mk>
+USE_SHLIBDIR= yes
+
.PATH: ${.CURDIR}/../../dist/common/zfs
.PATH: ${.CURDIR}/../../dist/common/fs/zfs
.PATH: ${.CURDIR}/../../dist/lib/libzfs/common
diff --git a/external/cddl/osnet/lib/libzpool/Makefile b/external/cddl/osnet/lib/libzpool/Makefile
index 9a25dfab23a..b8187c17fde 100644
--- a/external/cddl/osnet/lib/libzpool/Makefile
+++ b/external/cddl/osnet/lib/libzpool/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2018/05/28 21:05:09 chs Exp $
+# $NetBSD: Makefile,v 1.12.4.1 2019/09/27 09:24:29 martin Exp $
.include <bsd.init.mk>
+USE_SHLIBDIR= yes
+
.include "${.CURDIR}/../../dist/uts/common/Makefile.files"
.include "../../Makefile.zfs"
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index 81b28cf1e53..7c4a76afeb5 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2019/05/07 18:45:37 maya Exp $
+# $NetBSD: Makefile,v 1.94.2.1 2019/09/27 09:24:29 martin Exp $
#
NOSANITIZER= # defined
@@ -7,6 +7,8 @@ LIB= pthread
.include <bsd.own.mk>
+USE_SHLIBDIR= yes
+
.if defined(PTHREAD_MACHINE_ARCH) && !empty(PTHREAD_MACHINE_ARCH) && \
exists(${.CURDIR}/arch/${PTHREAD_MACHINE_ARCH})
ARCHSUBDIR= ${PTHREAD_MACHINE_ARCH}