Module Name: src
Committed By: pooka
Date: Sun Dec 5 16:11:17 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libnull: Makefile shlib_version
src/sys/rump/fs/lib/libumap: Makefile shlib_version
Removed Files:
src/sys/rump/fs/lib/libnullfs: Makefile shlib_version
src/sys/rump/fs/lib/libumapfs: Makefile shlib_version
Log Message:
Fix RUMPFSLIBS etc. As collateral, rename nullfs/umapfs to match
the vfsname, i.e. to "null" and "umap".
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libnull/Makefile \
src/sys/rump/fs/lib/libnull/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libnullfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnullfs/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libumap/Makefile \
src/sys/rump/fs/lib/libumap/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libumapfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libumapfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.25 src/sys/rump/fs/Makefile.rumpfs:1.26
--- src/sys/rump/fs/Makefile.rumpfs:1.25 Mon Jul 26 15:55:41 2010
+++ src/sys/rump/fs/Makefile.rumpfs Sun Dec 5 16:11:16 2010
@@ -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
Added files:
Index: src/sys/rump/fs/lib/libnull/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libnull/Makefile:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libnull/Makefile Sun Dec 5 16:11:16 2010
@@ -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>
Index: src/sys/rump/fs/lib/libnull/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libnull/shlib_version:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libnull/shlib_version Sun Dec 5 16:11:16 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/fs/lib/libumap/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libumap/Makefile:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libumap/Makefile Sun Dec 5 16:11:17 2010
@@ -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>
Index: src/sys/rump/fs/lib/libumap/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libumap/shlib_version:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libumap/shlib_version Sun Dec 5 16:11:17 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+major=0
+minor=0
