Module Name: src
Committed By: pooka
Date: Mon Mar 29 13:20:31 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Added Files:
src/sys/rump/fs/lib/libfifovfs: Makefile shlib_version
Removed Files:
src/sys/rump/librump/rumpvfs: vfsops_stub.c
Log Message:
Support fifofs in rump. Do not include it in rumpvfs directly,
since it involves some very non-fs'y components like sockets and
local domain networking. Also (for better or worse?), call it
rump*v*fs_fifofs instead of rumpfs_fifofs, since it does not really
provide a file system driver.
XXX: uses duplicate common symbols and functionality depends on
link order ... (but at least it works better than before this change)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libfifovfs/Makefile \
src/sys/rump/fs/lib/libfifovfs/shlib_version
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.8 -r0 src/sys/rump/librump/rumpvfs/vfsops_stub.c
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.18 src/sys/rump/fs/Makefile.rumpfs:1.19
--- src/sys/rump/fs/Makefile.rumpfs:1.18 Mon Mar 8 12:30:04 2010
+++ src/sys/rump/fs/Makefile.rumpfs Mon Mar 29 13:20:31 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpfs,v 1.18 2010/03/08 12:30:04 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.19 2010/03/29 13:20:31 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs mfs msdos nfs nilfs ntfs
-RUMPFSLIST+= smbfs syspuffs sysvbfs tmpfs udf
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs fifovfs hfs lfs mfs msdos
+RUMPFSLIST+= nfs nilfs ntfs smbfs syspuffs sysvbfs tmpfs udf
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.25 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.26
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.25 Mon Mar 8 12:17:45 2010
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Mar 29 13:20:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.25 2010/03/08 12:17:45 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.26 2010/03/29 13:20:31 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -17,7 +17,7 @@
#
SRCS= rump_vfs.c devnodes.c devnull.c rumpblk.c rumpfs.c vm_vfs.c
-SRCS+= fstrans_stub.c vfsops_stub.c
+SRCS+= fstrans_stub.c
SRCS+= rumpvfs_if_wrappers.c
Added files:
Index: src/sys/rump/fs/lib/libfifovfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libfifovfs/Makefile:1.1
--- /dev/null Mon Mar 29 13:20:31 2010
+++ src/sys/rump/fs/lib/libfifovfs/Makefile Mon Mar 29 13:20:31 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/29 13:20:31 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/fifofs
+
+LIB= rumpvfs_fifofs
+
+SRCS= fifo_vnops.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/fs/lib/libfifovfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libfifovfs/shlib_version:1.1
--- /dev/null Mon Mar 29 13:20:31 2010
+++ src/sys/rump/fs/lib/libfifovfs/shlib_version Mon Mar 29 13:20:31 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/29 13:20:31 pooka Exp $
+#
+major=0
+minor=0
