Module Name: src
Committed By: rmind
Date: Sat Sep 22 12:54:34 UTC 2018
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/kern: Makefile.rumpkerncomp
Added Files:
src/sys/rump/kern/lib/libnv: Makefile
Log Message:
Add rumpkern_nv (in-kernel RUMP libnv).
To generate a diff of this commit:
cvs rdiff -u -r1.847 -r1.848 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2228 -r1.2229 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.321 -r1.322 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.265 -r1.266 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/kern/Makefile.rumpkerncomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libnv/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.847 src/distrib/sets/lists/base/shl.mi:1.848
--- src/distrib/sets/lists/base/shl.mi:1.847 Mon Sep 3 15:30:36 2018
+++ src/distrib/sets/lists/base/shl.mi Sat Sep 22 12:54:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.847 2018/09/03 15:30:36 christos Exp $
+# $NetBSD: shl.mi,v 1.848 2018/09/22 12:54:34 rmind Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -689,6 +689,9 @@
./usr/lib/librumpkern_ksem.so base-obsolete obsolete
./usr/lib/librumpkern_ksem.so.0 base-obsolete obsolete
./usr/lib/librumpkern_ksem.so.0.0 base-obsolete obsolete
+./usr/lib/librumpkern_nv.so base-rump-shlib rump
+./usr/lib/librumpkern_nv.so.0 base-rump-shlib rump
+./usr/lib/librumpkern_nv.so.0.0 base-rump-shlib rump
./usr/lib/librumpkern_sljit.so base-rump-shlib rump,sljit
./usr/lib/librumpkern_sljit.so.0 base-rump-shlib rump,sljit
./usr/lib/librumpkern_sljit.so.0.0 base-rump-shlib rump,sljit
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2228 src/distrib/sets/lists/comp/mi:1.2229
--- src/distrib/sets/lists/comp/mi:1.2228 Thu Sep 6 19:19:44 2018
+++ src/distrib/sets/lists/comp/mi Sat Sep 22 12:54:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2228 2018/09/06 19:19:44 maxv Exp $
+# $NetBSD: mi,v 1.2229 2018/09/22 12:54:34 rmind Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3647,6 +3647,8 @@
./usr/lib/librumpkern_crypto_p.a comp-c-proflib rump,profile
./usr/lib/librumpkern_ksem.a comp-obsolete obsolete
./usr/lib/librumpkern_ksem_p.a comp-obsolete obsolete
+./usr/lib/librumpkern_nv.a comp-c-lib rump
+./usr/lib/librumpkern_nv_p.a comp-c-proflib rump,profile
./usr/lib/librumpkern_sljit.a comp-c-lib rump,sljit
./usr/lib/librumpkern_sljit_p.a comp-c-proflib rump,sljit,profile
./usr/lib/librumpkern_solaris.a comp-c-lib rump,zfs
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.321 src/distrib/sets/lists/comp/shl.mi:1.322
--- src/distrib/sets/lists/comp/shl.mi:1.321 Mon Aug 13 08:26:49 2018
+++ src/distrib/sets/lists/comp/shl.mi Sat Sep 22 12:54:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.321 2018/08/13 08:26:49 christos Exp $
+# $NetBSD: shl.mi,v 1.322 2018/09/22 12:54:34 rmind Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -213,6 +213,7 @@
./usr/lib/librumphijack_pic.a comp-c-piclib compatfile,picinstall,rump
./usr/lib/librumpkern_crypto_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpkern_ksem_pic.a comp-obsolete obsolete
+./usr/lib/librumpkern_nv_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpkern_sljit_pic.a comp-c-piclib picinstall,rump,sljit
./usr/lib/librumpkern_solaris_pic.a comp-c-piclib picinstall,rump,zfs
./usr/lib/librumpkern_sysproxy_pic.a comp-c-piclib picinstall,rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.265 src/distrib/sets/lists/debug/mi:1.266
--- src/distrib/sets/lists/debug/mi:1.265 Wed Sep 19 13:58:26 2018
+++ src/distrib/sets/lists/debug/mi Sat Sep 22 12:54:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.265 2018/09/19 13:58:26 maxv Exp $
+# $NetBSD: mi,v 1.266 2018/09/22 12:54:34 rmind Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -202,6 +202,7 @@
./usr/lib/librumphijack_g.a comp-c-debuglib debuglib,compatfile,rump
./usr/lib/librumpkern_crypto_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpkern_ksem_g.a comp-obsolete obsolete,compatfile
+./usr/lib/librumpkern_nv_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpkern_sljit_g.a comp-c-debuglib debuglib,rump,sljit
./usr/lib/librumpkern_solaris_g.a comp-c-debuglib debuglib,rump,zfs
./usr/lib/librumpkern_sysproxy_g.a comp-c-debuglib debuglib,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.207 src/distrib/sets/lists/debug/shl.mi:1.208
--- src/distrib/sets/lists/debug/shl.mi:1.207 Mon Sep 3 15:30:36 2018
+++ src/distrib/sets/lists/debug/shl.mi Sat Sep 22 12:54:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.207 2018/09/03 15:30:36 christos Exp $
+# $NetBSD: shl.mi,v 1.208 2018/09/22 12:54:34 rmind 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/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
@@ -234,6 +234,7 @@
./usr/libdata/debug/usr/lib/librumphijack.so.0.0.debug comp-rump-debug debug,compatfile,rump
./usr/libdata/debug/usr/lib/librumpkern_crypto.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpkern_ksem.so.0.0.debug comp-obsolete obsolete,compatfile
+./usr/libdata/debug/usr/lib/librumpkern_nv.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpkern_sljit.so.0.0.debug comp-rump-debug debug,rump,sljit
./usr/libdata/debug/usr/lib/librumpkern_solaris.so.0.0.debug comp-rump-debug debug,rump,zfs
./usr/libdata/debug/usr/lib/librumpkern_sysproxy.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/kern/Makefile.rumpkerncomp
diff -u src/sys/rump/kern/Makefile.rumpkerncomp:1.12 src/sys/rump/kern/Makefile.rumpkerncomp:1.13
--- src/sys/rump/kern/Makefile.rumpkerncomp:1.12 Sun Nov 15 16:54:16 2015
+++ src/sys/rump/kern/Makefile.rumpkerncomp Sat Sep 22 12:54:34 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.rumpkerncomp,v 1.12 2015/11/15 16:54:16 pooka Exp $
+# $NetBSD: Makefile.rumpkerncomp,v 1.13 2018/09/22 12:54:34 rmind Exp $
#
.include <bsd.own.mk>
-RUMPKERNCOMPS= crypto sysproxy tty z
+RUMPKERNCOMPS= crypto nv sysproxy tty z
RUMPSYSEMUS= sys_cygwin sys_linux sys_sunos
.if make(rumpdescribe)
Added files:
Index: src/sys/rump/kern/lib/libnv/Makefile
diff -u /dev/null src/sys/rump/kern/lib/libnv/Makefile:1.1
--- /dev/null Sat Sep 22 12:54:35 2018
+++ src/sys/rump/kern/lib/libnv/Makefile Sat Sep 22 12:54:34 2018
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2018/09/22 12:54:34 rmind Exp $
+#
+# Public Domain.
+#
+
+.PATH: ${.CURDIR}/../../../../external/bsd/libnv/dist
+
+LIB= rumpkern_nv
+COMMENT=Name/value pairs library
+
+SRCS= nvlist.c
+SRCS+= nvpair.c
+SRCS+= dnvlist.c
+SRCS+= nv_kern_netbsd.c
+
+#RUMPCOMP_INCS_DIR:= ${.PARSEDIR}
+#RUMPCOMP_USER_CPPFLAGS=-I${RUMPCOMP_INCS_DIR}
+
+CPPFLAGS+= -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>