Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Add USE_SHLIBDIR=yes to a number of Makefiles for the librar...



details:   https://anonhg.NetBSD.org/src/rev/5518b27605d5
branches:  trunk
changeset: 454603:5518b27605d5
user:      brad <brad%NetBSD.org@localhost>
date:      Sun Sep 22 18:45:19 2019 +0000

description:
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.

diffstat:

 distrib/sets/lists/base/shl.mi               |  26 +++++++++++++++++++++++++-
 external/cddl/osnet/lib/libavl/Makefile      |   4 +++-
 external/cddl/osnet/lib/libnvpair/Makefile   |   4 +++-
 external/cddl/osnet/lib/libumem/Makefile     |   4 +++-
 external/cddl/osnet/lib/libuutil/Makefile    |   5 ++++-
 external/cddl/osnet/lib/libzfs/Makefile      |   4 +++-
 external/cddl/osnet/lib/libzfs_core/Makefile |   4 +++-
 external/cddl/osnet/lib/libzpool/Makefile    |   4 +++-
 lib/libpthread/Makefile                      |   4 +++-
 9 files changed, 50 insertions(+), 9 deletions(-)

diffs (183 lines):

diff -r 4b304d6d3312 -r 5518b27605d5 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Sun Sep 22 18:31:59 2019 +0000
+++ b/distrib/sets/lists/base/shl.mi    Sun Sep 22 18:45:19 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.870 2019/09/06 11:12:06 christos Exp $
+# $NetBSD: shl.mi,v 1.871 2019/09/22 18:45:19 brad 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 -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libavl/Makefile
--- a/external/cddl/osnet/lib/libavl/Makefile   Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libavl/Makefile   Sun Sep 22 18:45:19 2019 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2019/09/22 18:45:19 brad Exp $
 
 .include <bsd.init.mk>
 
+USE_SHLIBDIR=  yes
+
 .PATH: ${.CURDIR}/../../dist/common/avl
 
 CPPFLAGS+=-Wall -Wno-unknown-pragmas
diff -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libnvpair/Makefile
--- a/external/cddl/osnet/lib/libnvpair/Makefile        Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libnvpair/Makefile        Sun Sep 22 18:45:19 2019 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.10 2019/06/04 08:45:17 hannken Exp $
+#      $NetBSD: Makefile,v 1.11 2019/09/22 18:45:19 brad Exp $
 
 .include <bsd.init.mk>
 
+USE_SHLIBDIR=  yes
+
 .PATH:  ${.CURDIR}/../../dist/lib/libnvpair
 .PATH:  ${.CURDIR}/../../dist/common/nvpair
 
diff -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libumem/Makefile
--- a/external/cddl/osnet/lib/libumem/Makefile  Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libumem/Makefile  Sun Sep 22 18:45:19 2019 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.6 2016/08/04 17:07:24 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2019/09/22 18:45:19 brad Exp $
 
 .include <bsd.init.mk>
 
+USE_SHLIBDIR=  yes
+
 LIB=   umem
 SRCS=  umem.c
 
diff -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libuutil/Makefile
--- a/external/cddl/osnet/lib/libuutil/Makefile Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libuutil/Makefile Sun Sep 22 18:45:19 2019 +0000
@@ -1,6 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2016/08/04 17:07:24 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2019/09/22 18:45:20 brad Exp $
 
 .include <bsd.init.mk>
+
+USE_SHLIBDIR=  yes
+
 .PATH: ${.CURDIR}/../../dist/lib/libuutil/common
 .PATH: ${.CURDIR}/../../dist/common/avl
 
diff -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libzfs/Makefile
--- a/external/cddl/osnet/lib/libzfs/Makefile   Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libzfs/Makefile   Sun Sep 22 18:45:19 2019 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.9 2018/05/28 21:05:09 chs Exp $
+#      $NetBSD: Makefile,v 1.10 2019/09/22 18:45:20 brad 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 -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libzfs_core/Makefile
--- a/external/cddl/osnet/lib/libzfs_core/Makefile      Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libzfs_core/Makefile      Sun Sep 22 18:45:19 2019 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2018/05/28 23:47:40 chs Exp $
+#      $NetBSD: Makefile,v 1.2 2019/09/22 18:45:20 brad 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 -r 4b304d6d3312 -r 5518b27605d5 external/cddl/osnet/lib/libzpool/Makefile
--- a/external/cddl/osnet/lib/libzpool/Makefile Sun Sep 22 18:31:59 2019 +0000
+++ b/external/cddl/osnet/lib/libzpool/Makefile Sun Sep 22 18:45:19 2019 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.12 2018/05/28 21:05:09 chs Exp $
+#      $NetBSD: Makefile,v 1.13 2019/09/22 18:45:20 brad Exp $
 
 .include <bsd.init.mk>
 
+USE_SHLIBDIR=  yes
+
 .include "${.CURDIR}/../../dist/uts/common/Makefile.files"
 .include "../../Makefile.zfs"
 
diff -r 4b304d6d3312 -r 5518b27605d5 lib/libpthread/Makefile
--- a/lib/libpthread/Makefile   Sun Sep 22 18:31:59 2019 +0000
+++ b/lib/libpthread/Makefile   Sun Sep 22 18:45:19 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.94 2019/05/07 18:45:37 maya Exp $
+#      $NetBSD: Makefile,v 1.95 2019/09/22 18:45:20 brad Exp $
 #
 
 NOSANITIZER=   # defined
@@ -7,6 +7,8 @@
 
 .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}



Home | Main Index | Thread Index | Old Index