Module Name: src
Committed By: pooka
Date: Thu Apr 10 00:09:09 UTC 2014
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/fs: Makefile.rumpfscomp
Added Files:
src/sys/rump/fs/lib/libaio: Makefile shlib_version
Log Message:
add aio driver as rump kernel component
To generate a diff of this commit:
cvs rdiff -u -r1.697 -r1.698 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1887 -r1.1888 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.262 -r1.263 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/fs/Makefile.rumpfscomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libaio/Makefile \
src/sys/rump/fs/lib/libaio/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/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.697 src/distrib/sets/lists/base/shl.mi:1.698
--- src/distrib/sets/lists/base/shl.mi:1.697 Fri Mar 21 17:00:18 2014
+++ src/distrib/sets/lists/base/shl.mi Thu Apr 10 00:09:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.697 2014/03/21 17:00:18 christos Exp $
+# $NetBSD: shl.mi,v 1.698 2014/04/10 00:09:08 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -706,6 +706,9 @@
./usr/lib/librumpvfs.so base-rump-shlib rump
./usr/lib/librumpvfs.so.0 base-rump-shlib rump
./usr/lib/librumpvfs.so.0.0 base-rump-shlib rump
+./usr/lib/librumpvfs_aio.so base-rump-shlib rump
+./usr/lib/librumpvfs_aio.so.0 base-rump-shlib rump
+./usr/lib/librumpvfs_aio.so.0.0 base-rump-shlib rump
./usr/lib/librumpvfs_fifofs.so base-rump-shlib rump
./usr/lib/librumpvfs_fifofs.so.0 base-rump-shlib rump
./usr/lib/librumpvfs_fifofs.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1887 src/distrib/sets/lists/comp/mi:1.1888
--- src/distrib/sets/lists/comp/mi:1.1887 Tue Mar 25 09:52:55 2014
+++ src/distrib/sets/lists/comp/mi Thu Apr 10 00:09:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1887 2014/03/25 09:52:55 ozaki-r Exp $
+# $NetBSD: mi,v 1.1888 2014/04/10 00:09:08 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3883,6 +3883,8 @@
./usr/lib/librumpuser.a comp-c-lib rump
./usr/lib/librumpuser_p.a comp-c-proflib profile,rump
./usr/lib/librumpvfs.a comp-c-lib rump
+./usr/lib/librumpvfs_aio.a comp-c-lib rump
+./usr/lib/librumpvfs_aio_p.a comp-c-proflib profile,rump
./usr/lib/librumpvfs_fifofs.a comp-c-lib rump
./usr/lib/librumpvfs_fifofs_p.a comp-c-proflib profile,rump
./usr/lib/librumpvfs_layerfs.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.262 src/distrib/sets/lists/comp/shl.mi:1.263
--- src/distrib/sets/lists/comp/shl.mi:1.262 Fri Mar 14 01:05:57 2014
+++ src/distrib/sets/lists/comp/shl.mi Thu Apr 10 00:09:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.262 2014/03/14 01:05:57 pooka Exp $
+# $NetBSD: shl.mi,v 1.263 2014/04/10 00:09:09 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -225,6 +225,7 @@
./usr/lib/librumpnet_sockin_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpnet_virtif_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpuser_pic.a comp-c-piclib rump,picinstall
+./usr/lib/librumpvfs_aio_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpvfs_fifofs_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpvfs_layerfs_pic.a comp-c-piclib rump,picinstall
./usr/lib/librumpvfs_pic.a comp-c-piclib rump,picinstall
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.55 src/distrib/sets/lists/debug/mi:1.56
--- src/distrib/sets/lists/debug/mi:1.55 Sun Apr 6 19:51:39 2014
+++ src/distrib/sets/lists/debug/mi Thu Apr 10 00:09:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.55 2014/04/06 19:51:39 christos Exp $
+# $NetBSD: mi,v 1.56 2014/04/10 00:09:09 pooka Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib
@@ -213,6 +213,7 @@
./usr/lib/librumpnet_sockin_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_virtif_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpuser_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpvfs_aio_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpvfs_fifofs_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpvfs_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpvfs_layerfs_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.58 src/distrib/sets/lists/debug/shl.mi:1.59
--- src/distrib/sets/lists/debug/shl.mi:1.58 Fri Mar 21 17:00:18 2014
+++ src/distrib/sets/lists/debug/shl.mi Thu Apr 10 00:09:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.58 2014/03/21 17:00:18 christos Exp $
+# $NetBSD: shl.mi,v 1.59 2014/04/10 00:09:09 pooka Exp $
./usr/libdata/debug/lib/libc.so.12.190.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/lib/libcrypto.so.8.2.debug comp-sys-debug debug
@@ -238,6 +238,7 @@
./usr/libdata/debug/usr/lib/librumpnet_virtif.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpuser.so.0.1.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpvfs.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpvfs_aio.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpvfs_fifofs.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpvfs_layerfs.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/libsaslc.so.0.0.debug comp-sys-debug crypto,debug
Index: src/sys/rump/fs/Makefile.rumpfscomp
diff -u src/sys/rump/fs/Makefile.rumpfscomp:1.4 src/sys/rump/fs/Makefile.rumpfscomp:1.5
--- src/sys/rump/fs/Makefile.rumpfscomp:1.4 Sun Jul 24 08:55:30 2011
+++ src/sys/rump/fs/Makefile.rumpfscomp Thu Apr 10 00:09:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpfscomp,v 1.4 2011/07/24 08:55:30 uch Exp $
+# $NetBSD: Makefile.rumpfscomp,v 1.5 2014/04/10 00:09:09 pooka Exp $
#
.include <bsd.own.mk>
@@ -15,6 +15,8 @@ RUMPFSCOMP+= nfsserver
RUMPVFSCOMP+= fifo layer
+RUMPFSSYSCOMP+= aio
+
.for var in ${RUMPFSCOMP}
RUMPFSLIBS+=lib${var}
RUMPFSLDADD+=-lrumpfs_${var}
@@ -24,3 +26,8 @@ RUMPFSLDADD+=-lrumpfs_${var}
RUMPFSLIBS+=lib${var}vfs
RUMPFSLDADD+=-lrumpvfs_${var}fs
.endfor
+
+.for var in ${RUMPFSSYSCOMP}
+RUMPFSLIBS+=lib${var}
+RUMPFSLDADD+=-lrumpvfs_${var}
+.endfor
Added files:
Index: src/sys/rump/fs/lib/libaio/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libaio/Makefile:1.1
--- /dev/null Thu Apr 10 00:09:09 2014
+++ src/sys/rump/fs/lib/libaio/Makefile Thu Apr 10 00:09:09 2014
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2014/04/10 00:09:09 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../kern
+
+LIB= rumpvfs_aio
+
+SRCS= sys_aio.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/fs/lib/libaio/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libaio/shlib_version:1.1
--- /dev/null Thu Apr 10 00:09:09 2014
+++ src/sys/rump/fs/lib/libaio/shlib_version Thu Apr 10 00:09:09 2014
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2014/04/10 00:09:09 pooka Exp $
+#
+major=0
+minor=0
