Module Name:    src
Committed By:   pooka
Date:           Sat Apr 10 21:33:01 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/libnullfs: Makefile
        src/tests/fs/nullfs: Makefile

Log Message:
Rename librumpfs_nullfs to librumpfs_null to make the basename the
same as with the kernel module (and hence MOUNT_NULL).

I added the old name to the obsolete list, but given that it was
in-tree for only a bit over a week, I'll remove the entries in a
few weeks.


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.531 -r1.532 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1422 -r1.1423 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libnullfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/nullfs/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.210 src/distrib/sets/lists/base/shl.elf:1.211
--- src/distrib/sets/lists/base/shl.elf:1.210	Wed Mar 31 14:21:22 2010
+++ src/distrib/sets/lists/base/shl.elf	Sat Apr 10 21:32:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.210 2010/03/31 14:21:22 pooka Exp $
+# $NetBSD: shl.elf,v 1.211 2010/04/10 21:32:59 pooka Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -302,8 +302,10 @@
 ./usr/lib/librumpfs_nilfs.so.0			base-rump-shlib
 ./usr/lib/librumpfs_ntfs.so			base-rump-shlib
 ./usr/lib/librumpfs_ntfs.so.0			base-rump-shlib
-./usr/lib/librumpfs_nullfs.so			base-rump-shlib
-./usr/lib/librumpfs_nullfs.so.0			base-rump-shlib
+./usr/lib/librumpfs_null.so			base-rump-shlib
+./usr/lib/librumpfs_null.so.0			base-rump-shlib
+./usr/lib/librumpfs_nullfs.so			base-obsolete		obsolete
+./usr/lib/librumpfs_nullfs.so.0			base-obsolete		obsolete
 ./usr/lib/librumpfs_smbfs.so			base-rump-shlib
 ./usr/lib/librumpfs_smbfs.so.0			base-rump-shlib
 ./usr/lib/librumpfs_syspuffs.so			base-rump-shlib

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.531 src/distrib/sets/lists/base/shl.mi:1.532
--- src/distrib/sets/lists/base/shl.mi:1.531	Wed Mar 31 14:21:22 2010
+++ src/distrib/sets/lists/base/shl.mi	Sat Apr 10 21:33:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.531 2010/03/31 14:21:22 pooka Exp $
+# $NetBSD: shl.mi,v 1.532 2010/04/10 21:33:00 pooka Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -158,7 +158,8 @@
 ./usr/lib/librumpfs_nfs.so.0.0			base-rump-shlib
 ./usr/lib/librumpfs_nilfs.so.0.0		base-rump-shlib
 ./usr/lib/librumpfs_ntfs.so.0.0			base-rump-shlib
-./usr/lib/librumpfs_nullfs.so.0.0		base-rump-shlib
+./usr/lib/librumpfs_null.so.0.0			base-rump-shlib
+./usr/lib/librumpfs_nullfs.so.0.0		base-obsolete		obsolete
 ./usr/lib/librumpfs_smbfs.so.0.0		base-rump-shlib
 ./usr/lib/librumpfs_syspuffs.so.0.0		base-rump-shlib
 ./usr/lib/librumpfs_sysvbfs.so.0.0		base-rump-shlib

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1422 src/distrib/sets/lists/comp/mi:1.1423
--- src/distrib/sets/lists/comp/mi:1.1422	Wed Mar 31 14:21:22 2010
+++ src/distrib/sets/lists/comp/mi	Sat Apr 10 21:33:00 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1422 2010/03/31 14:21:22 pooka Exp $
+#	$NetBSD: mi,v 1.1423 2010/04/10 21:33:00 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2664,9 +2664,12 @@
 ./usr/lib/librumpfs_ntfs.a			comp-c-lib
 ./usr/lib/librumpfs_ntfs_g.a			-unknown-		debuglib
 ./usr/lib/librumpfs_ntfs_p.a			comp-c-proflib		profile
-./usr/lib/librumpfs_nullfs.a			comp-c-lib
-./usr/lib/librumpfs_nullfs_g.a			-unknown-		debuglib
-./usr/lib/librumpfs_nullfs_p.a			comp-c-proflib		profile
+./usr/lib/librumpfs_null.a			comp-c-lib
+./usr/lib/librumpfs_null_g.a			-unknown-		debuglib
+./usr/lib/librumpfs_null_p.a			comp-c-proflib		profile
+./usr/lib/librumpfs_nullfs.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_nullfs_g.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_nullfs_p.a			comp-obsolete		obsolete
 ./usr/lib/librumpfs_smbfs.a			comp-c-lib
 ./usr/lib/librumpfs_smbfs_g.a			-unknown-		debuglib
 ./usr/lib/librumpfs_smbfs_p.a			comp-c-proflib		profile

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.112 src/distrib/sets/lists/comp/shl.mi:1.113
--- src/distrib/sets/lists/comp/shl.mi:1.112	Wed Mar 31 14:21:23 2010
+++ src/distrib/sets/lists/comp/shl.mi	Sat Apr 10 21:33:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.112 2010/03/31 14:21:23 pooka Exp $
+# $NetBSD: shl.mi,v 1.113 2010/04/10 21:33:00 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -120,7 +120,8 @@
 ./usr/lib/librumpfs_nfs_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_nilfs_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_ntfs_pic.a			comp-c-piclib
-./usr/lib/librumpfs_nullfs_pic.a		comp-c-piclib
+./usr/lib/librumpfs_null_pic.a			comp-c-piclib
+./usr/lib/librumpfs_nullfs_pic.a		comp-obsolete		obsolete
 ./usr/lib/librumpfs_smbfs_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_syspuffs_pic.a		comp-c-piclib
 ./usr/lib/librumpfs_sysvbfs_pic.a		comp-c-piclib

Index: src/sys/rump/fs/lib/libnullfs/Makefile
diff -u src/sys/rump/fs/lib/libnullfs/Makefile:1.1 src/sys/rump/fs/lib/libnullfs/Makefile:1.2
--- src/sys/rump/fs/lib/libnullfs/Makefile:1.1	Tue Mar 30 00:59:07 2010
+++ src/sys/rump/fs/lib/libnullfs/Makefile	Sat Apr 10 21:32:59 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/10 21:32:59 pooka Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../../miscfs/nullfs
 
-LIB=	rumpfs_nullfs
+LIB=	rumpfs_null
 
 SRCS=	null_vfsops.c null_vnops.c
 

Index: src/tests/fs/nullfs/Makefile
diff -u src/tests/fs/nullfs/Makefile:1.2 src/tests/fs/nullfs/Makefile:1.3
--- src/tests/fs/nullfs/Makefile:1.2	Tue Mar 30 01:40:29 2010
+++ src/tests/fs/nullfs/Makefile	Sat Apr 10 21:33:01 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/10 21:33:01 pooka Exp $
 #
 
 TESTSDIR=	${TESTSBASE}/fs/nullfs
@@ -6,7 +6,7 @@
 
 TESTS_C=	t_basic
 
-LDADD+=	-lrumpfs_tmpfs -lrumpfs_nullfs -lrumpvfs_layerfs	# fs drivers
+LDADD+=	-lrumpfs_tmpfs -lrumpfs_null -lrumpvfs_layerfs		# fs drivers
 LDADD+=	-lrumpvfs -lrump -lrumpuser -lpthread			# base
 
 .include <bsd.test.mk>

Reply via email to