Module Name: src
Committed By: pooka
Date: Sun Apr 11 05:45:58 UTC 2010
Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/sys/rump/fs/lib/libumapfs: Makefile
src/tests/fs/umapfs: Makefile
Log Message:
Following nullfs, rename rumpfs_umapfs to rumpfs_umap to make the
basename the same as the kernel module (this too was in-tree only
for a little over a week with the old name).
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.532 -r1.533 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1423 -r1.1424 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libumapfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/umapfs/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.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.211 src/distrib/sets/lists/base/shl.elf:1.212
--- src/distrib/sets/lists/base/shl.elf:1.211 Sat Apr 10 21:32:59 2010
+++ src/distrib/sets/lists/base/shl.elf Sun Apr 11 05:45:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.211 2010/04/10 21:32:59 pooka Exp $
+# $NetBSD: shl.elf,v 1.212 2010/04/11 05:45:57 pooka Exp $
#
# Note: Do not mark "old" major and major.minor shared libraries as
# "obsolete"; just remove the entry, as third-party applications
@@ -318,8 +318,10 @@
./usr/lib/librumpfs_udf.so.0 base-rump-shlib
./usr/lib/librumpfs_ufs.so base-obsolete obsolete
./usr/lib/librumpfs_ufs.so.0 base-obsolete obsolete
-./usr/lib/librumpfs_umapfs.so base-rump-shlib
-./usr/lib/librumpfs_umapfs.so.0 base-rump-shlib
+./usr/lib/librumpfs_umap.so base-rump-shlib
+./usr/lib/librumpfs_umap.so.0 base-rump-shlib
+./usr/lib/librumpfs_umapfs.so base-obsolete obsolete
+./usr/lib/librumpfs_umapfs.so.0 base-obsolete obsolete
./usr/lib/librumpfs_union.so base-rump-shlib
./usr/lib/librumpfs_union.so.0 base-rump-shlib
./usr/lib/librumpvfs_fifofs.so base-rump-shlib
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.532 src/distrib/sets/lists/base/shl.mi:1.533
--- src/distrib/sets/lists/base/shl.mi:1.532 Sat Apr 10 21:33:00 2010
+++ src/distrib/sets/lists/base/shl.mi Sun Apr 11 05:45:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.532 2010/04/10 21:33:00 pooka Exp $
+# $NetBSD: shl.mi,v 1.533 2010/04/11 05:45:57 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -166,7 +166,8 @@
./usr/lib/librumpfs_tmpfs.so.0.0 base-rump-shlib
./usr/lib/librumpfs_udf.so.0.0 base-rump-shlib
./usr/lib/librumpfs_ufs.so.0.0 base-obsolete obsolete
-./usr/lib/librumpfs_umapfs.so.0.0 base-rump-shlib
+./usr/lib/librumpfs_umap.so.0.0 base-rump-shlib
+./usr/lib/librumpfs_umapfs.so.0.0 base-obsolete obsolete
./usr/lib/librumpfs_union.so.0.0 base-rump-shlib
./usr/lib/librumpvfs_fifofs.so.0.0 base-rump-shlib
./usr/lib/librumpvfs_layerfs.so.0.0 base-rump-shlib
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1423 src/distrib/sets/lists/comp/mi:1.1424
--- src/distrib/sets/lists/comp/mi:1.1423 Sat Apr 10 21:33:00 2010
+++ src/distrib/sets/lists/comp/mi Sun Apr 11 05:45:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1423 2010/04/10 21:33:00 pooka Exp $
+# $NetBSD: mi,v 1.1424 2010/04/11 05:45:57 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2688,9 +2688,12 @@
./usr/lib/librumpfs_ufs.a comp-obsolete obsolete
./usr/lib/librumpfs_ufs_g.a comp-obsolete obsolete
./usr/lib/librumpfs_ufs_p.a comp-obsolete obsolete
-./usr/lib/librumpfs_umapfs.a comp-c-lib
-./usr/lib/librumpfs_umapfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_umapfs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_umap.a comp-c-lib
+./usr/lib/librumpfs_umap_g.a -unknown- debuglib
+./usr/lib/librumpfs_umap_p.a comp-c-proflib profile
+./usr/lib/librumpfs_umapfs.a comp-obsolete obsolete
+./usr/lib/librumpfs_umapfs_g.a comp-obsolete obsolete
+./usr/lib/librumpfs_umapfs_p.a comp-obsolete obsolete
./usr/lib/librumpfs_union.a comp-c-lib
./usr/lib/librumpfs_union_g.a -unknown- debuglib
./usr/lib/librumpfs_union_p.a comp-c-proflib profile
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.113 src/distrib/sets/lists/comp/shl.mi:1.114
--- src/distrib/sets/lists/comp/shl.mi:1.113 Sat Apr 10 21:33:00 2010
+++ src/distrib/sets/lists/comp/shl.mi Sun Apr 11 05:45:58 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.113 2010/04/10 21:33:00 pooka Exp $
+# $NetBSD: shl.mi,v 1.114 2010/04/11 05:45:58 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -128,7 +128,8 @@
./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib
./usr/lib/librumpfs_udf_pic.a comp-c-piclib
./usr/lib/librumpfs_ufs_pic.a comp-obsolete obsolete
-./usr/lib/librumpfs_umapfs_pic.a comp-c-piclib
+./usr/lib/librumpfs_umap_pic.a comp-c-piclib
+./usr/lib/librumpfs_umapfs_pic.a comp-obsolete obsolete
./usr/lib/librumpfs_union_pic.a comp-c-piclib
./usr/lib/librumpvfs_fifofs_pic.a comp-c-piclib
./usr/lib/librumpvfs_layerfs_pic.a comp-c-piclib
Index: src/sys/rump/fs/lib/libumapfs/Makefile
diff -u src/sys/rump/fs/lib/libumapfs/Makefile:1.1 src/sys/rump/fs/lib/libumapfs/Makefile:1.2
--- src/sys/rump/fs/lib/libumapfs/Makefile:1.1 Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/lib/libumapfs/Makefile Sun Apr 11 05:45:57 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2010/03/30 00:59:07 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/11 05:45:57 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../miscfs/umapfs
-LIB= rumpfs_umapfs
+LIB= rumpfs_umap
SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
Index: src/tests/fs/umapfs/Makefile
diff -u src/tests/fs/umapfs/Makefile:1.2 src/tests/fs/umapfs/Makefile:1.3
--- src/tests/fs/umapfs/Makefile:1.2 Tue Mar 30 01:40:29 2010
+++ src/tests/fs/umapfs/Makefile Sun Apr 11 05:45:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/03/30 01:40:29 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/04/11 05:45:57 pooka Exp $
#
TESTSDIR= ${TESTSBASE}/fs/umapfs
@@ -6,7 +6,7 @@
TESTS_C= t_basic
-LDADD+= -lrumpfs_tmpfs -lrumpfs_umapfs -lrumpvfs_layerfs # fs drivers
+LDADD+= -lrumpfs_tmpfs -lrumpfs_umap -lrumpvfs_layerfs # fs drivers
LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
.include <bsd.test.mk>
