Module Name: src
Committed By: mlelstv
Date: Sun Jul 31 12:40:35 UTC 2022
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi
src/lib/libisns: Makefile
Log Message:
Move libisns to /lib to allow /sbin/iscsid to work without /usr being
mounted.
To generate a diff of this commit:
cvs rdiff -u -r1.937 -r1.938 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.294 -r1.295 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.6 -r1.7 src/lib/libisns/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.937 src/distrib/sets/lists/base/shl.mi:1.938
--- src/distrib/sets/lists/base/shl.mi:1.937 Mon Jun 6 10:56:27 2022
+++ src/distrib/sets/lists/base/shl.mi Sun Jul 31 12:40:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.937 2022/06/06 10:56:27 nia Exp $
+# $NetBSD: shl.mi,v 1.938 2022/07/31 12:40:35 mlelstv Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -51,6 +51,9 @@
./lib/libipsec.so base-net-shlib dynamicroot
./lib/libipsec.so.3 base-net-shlib dynamicroot
./lib/libipsec.so.3.0 base-net-shlib dynamicroot
+./lib/libisns.so base-isns-shlib dynamicroot
+./lib/libisns.so.0 base-isns-shlib dynamicroot
+./lib/libisns.so.0.0 base-isns-shlib dynamicroot
./lib/libkvm.so base-sys-shlib dynamicroot
./lib/libkvm.so.6 base-sys-shlib dynamicroot
./lib/libkvm.so.6.0 base-sys-shlib dynamicroot
@@ -388,9 +391,9 @@
./usr/lib/libiscsi.so base-iscsi-shlib iscsi,compatfile
./usr/lib/libiscsi.so.2 base-iscsi-shlib iscsi,compatfile
./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile
-./usr/lib/libisns.so base-isns-shlib compatfile
-./usr/lib/libisns.so.0 base-isns-shlib compatfile
-./usr/lib/libisns.so.0.0 base-isns-shlib compatfile
+./usr/lib/libisns.so base-isns-shlib obsolete,compatfile
+./usr/lib/libisns.so.0 base-isns-shlib obsolete,compatfile
+./usr/lib/libisns.so.0.0 base-isns-shlib obsolete,compatfile
./usr/lib/libjemalloc.so base-sys-shlib compatfile
./usr/lib/libjemalloc.so.0 base-sys-shlib compatfile
./usr/lib/libjemalloc.so.0.0 base-sys-shlib compatfile
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.294 src/distrib/sets/lists/debug/shl.mi:1.295
--- src/distrib/sets/lists/debug/shl.mi:1.294 Mon Jun 6 10:56:27 2022
+++ src/distrib/sets/lists/debug/shl.mi Sun Jul 31 12:40:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.294 2022/06/06 10:56:27 nia Exp $
+# $NetBSD: shl.mi,v 1.295 2022/07/31 12:40:35 mlelstv 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
@@ -14,6 +14,7 @@
./usr/libdata/debug/lib/libevent.so.4.2.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug debug,dynamicroot,gcc
./usr/libdata/debug/lib/libipsec.so.3.0.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libisns.so.0.0.debug comp-isns-debug debug,dynamicroot
./usr/libdata/debug/lib/libkvm.so.6.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/liblzf.so.1.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/liblzma.so.2.0.debug comp-sys-debug debug,dynamicroot
@@ -141,7 +142,7 @@
./usr/libdata/debug/usr/lib/libisccc.so.18.0.debug comp-bind-debug debug,compatfile
./usr/libdata/debug/usr/lib/libisccfg.so.18.0.debug comp-bind-debug debug,compatfile
./usr/libdata/debug/usr/lib/libiscsi.so.2.0.debug comp-iscsi-debug debug,compatfile,iscsi
-./usr/libdata/debug/usr/lib/libisns.so.0.0.debug comp-isns-debug debug,compatfile
+./usr/libdata/debug/usr/lib/libisns.so.0.0.debug comp-isns-debug debug,compatfile,obsolete
./usr/libdata/debug/usr/lib/libjemalloc.so.0.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libkadm5clnt.so.14.0.debug comp-krb5-debug debug,compatfile,kerberos
./usr/libdata/debug/usr/lib/libkadm5srv.so.15.0.debug comp-krb5-debug debug,compatfile,kerberos
Index: src/lib/libisns/Makefile
diff -u src/lib/libisns/Makefile:1.6 src/lib/libisns/Makefile:1.7
--- src/lib/libisns/Makefile:1.6 Sun Oct 13 07:28:10 2019
+++ src/lib/libisns/Makefile Sun Jul 31 12:40:35 2022
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:10 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2022/07/31 12:40:35 mlelstv Exp $
.include <bsd.own.mk>
+USE_SHLIBDIR= yes
+
LIB= isns
SRCS= isns.c isns_pdu.c isns_socketio.c isns_task.c isns_thread.c
SRCS+= isns_util.c isns_fileio.c
