[src/trunk]: src/sys/rump/fs Fix RUMPFSLIBS etc. As collateral, rename nullf...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/52773c9d0218
branches:  trunk
changeset: 759312:52773c9d0218
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Dec 05 16:11:16 2010 +0000

description:
Fix RUMPFSLIBS etc.  As collateral, rename nullfs/umapfs to match
the vfsname, i.e. to "null" and "umap".

diffstat:

 sys/rump/fs/Makefile.rumpfs             |  19 ++++++++++++-------
 sys/rump/fs/lib/libnull/Makefile        |  11 +++++++++++
 sys/rump/fs/lib/libnull/shlib_version   |   4 ++++
 sys/rump/fs/lib/libnullfs/Makefile      |  11 -----------
 sys/rump/fs/lib/libnullfs/shlib_version |   4 ----
 sys/rump/fs/lib/libumap/Makefile        |  11 +++++++++++
 sys/rump/fs/lib/libumap/shlib_version   |   4 ++++
 sys/rump/fs/lib/libumapfs/Makefile      |  11 -----------
 sys/rump/fs/lib/libumapfs/shlib_version |   4 ----
 9 files changed, 42 insertions(+), 37 deletions(-)

diffs (123 lines):

diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/Makefile.rumpfs
--- a/sys/rump/fs/Makefile.rumpfs       Sun Dec 05 16:02:04 2010 +0000
+++ b/sys/rump/fs/Makefile.rumpfs       Sun Dec 05 16:11:16 2010 +0000
@@ -1,15 +1,20 @@
-#      $NetBSD: Makefile.rumpfs,v 1.25 2010/07/26 15:55:41 pooka Exp $
+#      $NetBSD: Makefile.rumpfs,v 1.26 2010/12/05 16:11:16 pooka Exp $
 #
 
-RUMPFSLIST=    cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos    \
-               nfs nilfs ntfs nullfs ptyfs smbfs syspuffs sysvbfs      \
-               tmpfs udf umapfs union
+RUMPFSCOMP=    cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos    \
+               nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs        \
+               tmpfs udf umap union
 
-RUMPFSLIST+=   fifovfs layervfs
+RUMPFSCOMP+=   nfsserver
 
-RUMPFSLIST+=   nfsserver
+RUMPVFSCOMP+=  fifo layer
 
-.for var in ${RUMPFSLIST}
+.for var in ${RUMPFSCOMP}
 RUMPFSLIBS+=lib${var}
 RUMPFSLDADD+=-lrumpfs_${var}
 .endfor
+
+.for var in ${RUMPVFSCOMP}
+RUMPFSLIBS+=lib${var}vfs
+RUMPFSLDADD+=-lrumpvfs_${var}fs
+.endfor
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libnull/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/fs/lib/libnull/Makefile  Sun Dec 05 16:11:16 2010 +0000
@@ -0,0 +1,11 @@
+#      $NetBSD: Makefile,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+
+.PATH:  ${.CURDIR}/../../../../miscfs/nullfs
+
+LIB=   rumpfs_null
+
+SRCS=  null_vfsops.c null_vnops.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libnull/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/fs/lib/libnull/shlib_version     Sun Dec 05 16:11:16 2010 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+major=0
+minor=0
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libnullfs/Makefile
--- a/sys/rump/fs/lib/libnullfs/Makefile        Sun Dec 05 16:02:04 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2010/04/10 21:32:59 pooka Exp $
-#
-
-.PATH:  ${.CURDIR}/../../../../miscfs/nullfs
-
-LIB=   rumpfs_null
-
-SRCS=  null_vfsops.c null_vnops.c
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libnullfs/shlib_version
--- a/sys/rump/fs/lib/libnullfs/shlib_version   Sun Dec 05 16:02:04 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: shlib_version,v 1.1 2010/03/30 00:59:07 pooka Exp $
-#
-major=0
-minor=0
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libumap/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/fs/lib/libumap/Makefile  Sun Dec 05 16:11:16 2010 +0000
@@ -0,0 +1,11 @@
+#      $NetBSD: Makefile,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+
+.PATH:  ${.CURDIR}/../../../../miscfs/umapfs
+
+LIB=   rumpfs_umap
+
+SRCS=  umap_subr.c umap_vfsops.c umap_vnops.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libumap/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/fs/lib/libumap/shlib_version     Sun Dec 05 16:11:16 2010 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+major=0
+minor=0
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libumapfs/Makefile
--- a/sys/rump/fs/lib/libumapfs/Makefile        Sun Dec 05 16:02:04 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2010/04/11 05:45:57 pooka Exp $
-#
-
-.PATH:  ${.CURDIR}/../../../../miscfs/umapfs
-
-LIB=   rumpfs_umap
-
-SRCS=  umap_subr.c umap_vfsops.c umap_vnops.c
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
diff -r 77929ea7efaf -r 52773c9d0218 sys/rump/fs/lib/libumapfs/shlib_version
--- a/sys/rump/fs/lib/libumapfs/shlib_version   Sun Dec 05 16:02:04 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: shlib_version,v 1.1 2010/03/30 00:59:07 pooka Exp $
-#
-major=0
-minor=0