From 7b679f625d6d9522b15dcbd467b59f2dc6c478b2 Mon Sep 17 00:00:00 2001 From: pooka Date: Tue, 5 Aug 2008 14:42:03 +0000 Subject: [PATCH] Maintain consistency of naming between the rumpfs library name and the MOUNT_FOOFS name. Don't bother polluting the obsolete lists with the original names since they were in only for a few days. --- distrib/sets/lists/base/shl.elf | 10 +++++----- distrib/sets/lists/base/shl.mi | 6 +++--- distrib/sets/lists/comp/mi | 10 +++++----- distrib/sets/lists/comp/shl.mi | 6 +++--- sys/rump/fs/Makefile.rumpfs | 4 ++-- sys/rump/fs/lib/{libcd9660fs => libcd9660}/Makefile | 4 ++-- sys/rump/fs/lib/libcd9660/shlib_version | 4 ++++ sys/rump/fs/lib/libcd9660fs/shlib_version | 4 ---- sys/rump/fs/lib/{libmsdosfs => libmsdos}/Makefile | 4 ++-- sys/rump/fs/lib/libmsdos/shlib_version | 4 ++++ sys/rump/fs/lib/libmsdosfs/shlib_version | 4 ---- 11 files changed, 30 insertions(+), 30 deletions(-) rename sys/rump/fs/lib/{libcd9660fs => libcd9660}/Makefile (74%) create mode 100644 sys/rump/fs/lib/libcd9660/shlib_version delete mode 100644 sys/rump/fs/lib/libcd9660fs/shlib_version rename sys/rump/fs/lib/{libmsdosfs => libmsdos}/Makefile (74%) create mode 100644 sys/rump/fs/lib/libmsdos/shlib_version delete mode 100644 sys/rump/fs/lib/libmsdosfs/shlib_version diff --git a/distrib/sets/lists/base/shl.elf b/distrib/sets/lists/base/shl.elf index abbb08d20e9f..38cdb8cb2c4d 100644 --- a/distrib/sets/lists/base/shl.elf +++ b/distrib/sets/lists/base/shl.elf @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.150 2008/07/29 13:17:40 pooka Exp $ +# $NetBSD: shl.elf,v 1.151 2008/08/05 14:42:03 pooka Exp $ # # Note: Do not mark "old" major and major.minor shared libraries as # "obsolete"; just remove the entry, as third-party applications @@ -210,8 +210,8 @@ ./usr/lib/librt.so.0 base-sys-shlib ./usr/lib/librump.so base-sys-shlib ./usr/lib/librump.so.0 base-sys-shlib -./usr/lib/librumpfs_cd9660fs.so base-sys-shlib -./usr/lib/librumpfs_cd9660fs.so.0 base-sys-shlib +./usr/lib/librumpfs_cd9660.so base-sys-shlib +./usr/lib/librumpfs_cd9660.so.0 base-sys-shlib ./usr/lib/librumpfs_efs.so base-sys-shlib ./usr/lib/librumpfs_efs.so.0 base-sys-shlib ./usr/lib/librumpfs_ext2fs.so base-sys-shlib @@ -222,8 +222,8 @@ ./usr/lib/librumpfs_hfs.so.0 base-sys-shlib ./usr/lib/librumpfs_lfs.so base-sys-shlib ./usr/lib/librumpfs_lfs.so.0 base-sys-shlib -./usr/lib/librumpfs_msdosfs.so base-sys-shlib -./usr/lib/librumpfs_msdosfs.so.0 base-sys-shlib +./usr/lib/librumpfs_msdos.so base-sys-shlib +./usr/lib/librumpfs_msdos.so.0 base-sys-shlib ./usr/lib/librumpfs_ntfs.so base-sys-shlib ./usr/lib/librumpfs_ntfs.so.0 base-sys-shlib ./usr/lib/librumpfs_syspuffs.so base-sys-shlib diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index 904fb7b065a7..84dce0fa3d62 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.442 2008/08/04 21:32:13 matt Exp $ +# $NetBSD: shl.mi,v 1.443 2008/08/05 14:42:03 pooka Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -112,13 +112,13 @@ ./usr/lib/librpcsvc.so.0.0 base-net-shlib ./usr/lib/librt.so.0.0 base-sys-shlib ./usr/lib/librump.so.0.0 base-sys-shlib -./usr/lib/librumpfs_cd9660fs.so.0.0 base-sys-shlib +./usr/lib/librumpfs_cd9660.so.0.0 base-sys-shlib ./usr/lib/librumpfs_efs.so.0.0 base-sys-shlib ./usr/lib/librumpfs_ext2fs.so.0.0 base-sys-shlib ./usr/lib/librumpfs_ffs.so.0.0 base-sys-shlib ./usr/lib/librumpfs_hfs.so.0.0 base-sys-shlib ./usr/lib/librumpfs_lfs.so.0.0 base-sys-shlib -./usr/lib/librumpfs_msdosfs.so.0.0 base-sys-shlib +./usr/lib/librumpfs_msdos.so.0.0 base-sys-shlib ./usr/lib/librumpfs_ntfs.so.0.0 base-sys-shlib ./usr/lib/librumpfs_syspuffs.so.0.0 base-sys-shlib ./usr/lib/librumpfs_tmpfs.so.0.0 base-sys-shlib diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 36d9315229a9..19cc46beebbc 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1172 2008/08/04 21:33:01 matt Exp $ +# $NetBSD: mi,v 1.1173 2008/08/05 14:42:03 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2354,8 +2354,8 @@ ./usr/lib/librt_p.a comp-c-proflib profile ./usr/lib/librump.a comp-c-lib ./usr/lib/librump_p.a comp-c-proflib profile -./usr/lib/librumpfs_cd9660fs.a comp-c-lib -./usr/lib/librumpfs_cd9660fs_p.a comp-c-proflib profile +./usr/lib/librumpfs_cd9660.a comp-c-lib +./usr/lib/librumpfs_cd9660_p.a comp-c-proflib profile ./usr/lib/librumpfs_efs.a comp-c-lib ./usr/lib/librumpfs_efs_p.a comp-c-proflib profile ./usr/lib/librumpfs_ext2fs.a comp-c-lib @@ -2366,8 +2366,8 @@ ./usr/lib/librumpfs_hfs_p.a comp-c-proflib profile ./usr/lib/librumpfs_lfs.a comp-c-lib ./usr/lib/librumpfs_lfs_p.a comp-c-proflib profile -./usr/lib/librumpfs_msdosfs.a comp-c-lib -./usr/lib/librumpfs_msdosfs_p.a comp-c-proflib profile +./usr/lib/librumpfs_msdos.a comp-c-lib +./usr/lib/librumpfs_msdos_p.a comp-c-proflib profile ./usr/lib/librumpfs_ntfs.a comp-c-lib ./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile ./usr/lib/librumpfs_syspuffs.a comp-c-lib diff --git a/distrib/sets/lists/comp/shl.mi b/distrib/sets/lists/comp/shl.mi index 21159e62712d..809b314234ea 100644 --- a/distrib/sets/lists/comp/shl.mi +++ b/distrib/sets/lists/comp/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.65 2008/07/29 13:17:40 pooka Exp $ +# $NetBSD: shl.mi,v 1.66 2008/08/05 14:42:03 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -77,13 +77,13 @@ ./usr/lib/librpcsvc_pic.a comp-c-piclib ./usr/lib/librt_pic.a comp-c-piclib ./usr/lib/librump_pic.a comp-c-piclib -./usr/lib/librumpfs_cd9660fs_pic.a comp-c-piclib +./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib ./usr/lib/librumpfs_efs_pic.a comp-c-piclib ./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib ./usr/lib/librumpfs_ffs_pic.a comp-c-piclib ./usr/lib/librumpfs_hfs_pic.a comp-c-piclib ./usr/lib/librumpfs_lfs_pic.a comp-c-piclib -./usr/lib/librumpfs_msdosfs_pic.a comp-c-piclib +./usr/lib/librumpfs_msdos_pic.a comp-c-piclib ./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib ./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib ./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib diff --git a/sys/rump/fs/Makefile.rumpfs b/sys/rump/fs/Makefile.rumpfs index a60a09671bb5..b2e14efd7b2d 100644 --- a/sys/rump/fs/Makefile.rumpfs +++ b/sys/rump/fs/Makefile.rumpfs @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.rumpfs,v 1.9 2008/07/29 13:17:41 pooka Exp $ +# $NetBSD: Makefile.rumpfs,v 1.10 2008/08/05 14:42:03 pooka Exp $ # -RUMPFSLIST= cd9660fs efs ext2fs ffs hfs lfs msdosfs ntfs syspuffs tmpfs udf +RUMPFSLIST= cd9660 efs ext2fs ffs hfs lfs msdos ntfs syspuffs tmpfs udf RUMPFSALL= ${RUMPFSLIST} ufs .for var in ${RUMPFSALL} diff --git a/sys/rump/fs/lib/libcd9660fs/Makefile b/sys/rump/fs/lib/libcd9660/Makefile similarity index 74% rename from sys/rump/fs/lib/libcd9660fs/Makefile rename to sys/rump/fs/lib/libcd9660/Makefile index 18fea835f440..75cab2b3ec21 100644 --- a/sys/rump/fs/lib/libcd9660fs/Makefile +++ b/sys/rump/fs/lib/libcd9660/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2008/07/29 13:17:42 pooka Exp $ +# $NetBSD: Makefile,v 1.1 2008/08/05 14:42:03 pooka Exp $ # .PATH: ${.CURDIR}/../../../../fs/cd9660 -LIB= rumpfs_cd9660fs +LIB= rumpfs_cd9660 SRCS= cd9660_bmap.c cd9660_node.c cd9660_util.c cd9660_vnops.c \ cd9660_lookup.c cd9660_rrip.c cd9660_vfsops.c diff --git a/sys/rump/fs/lib/libcd9660/shlib_version b/sys/rump/fs/lib/libcd9660/shlib_version new file mode 100644 index 000000000000..fcc3a192fc7c --- /dev/null +++ b/sys/rump/fs/lib/libcd9660/shlib_version @@ -0,0 +1,4 @@ +# $NetBSD: shlib_version,v 1.1 2008/08/05 14:42:03 pooka Exp $ +# +major=0 +minor=0 diff --git a/sys/rump/fs/lib/libcd9660fs/shlib_version b/sys/rump/fs/lib/libcd9660fs/shlib_version deleted file mode 100644 index 0abe9d4fbe64..000000000000 --- a/sys/rump/fs/lib/libcd9660fs/shlib_version +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: shlib_version,v 1.1 2008/07/29 13:17:42 pooka Exp $ -# -major=0 -minor=0 diff --git a/sys/rump/fs/lib/libmsdosfs/Makefile b/sys/rump/fs/lib/libmsdos/Makefile similarity index 74% rename from sys/rump/fs/lib/libmsdosfs/Makefile rename to sys/rump/fs/lib/libmsdos/Makefile index daf3f153faec..3463d20001d8 100644 --- a/sys/rump/fs/lib/libmsdosfs/Makefile +++ b/sys/rump/fs/lib/libmsdos/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2008/07/29 13:17:43 pooka Exp $ +# $NetBSD: Makefile,v 1.1 2008/08/05 14:42:03 pooka Exp $ # .PATH: ${.CURDIR}/../../../../fs/msdosfs -LIB= rumpfs_msdosfs +LIB= rumpfs_msdos SRCS= msdosfs_conv.c msdosfs_fat.c msdosfs_vfsops.c msdosfs_denode.c \ msdosfs_lookup.c msdosfs_vnops.c diff --git a/sys/rump/fs/lib/libmsdos/shlib_version b/sys/rump/fs/lib/libmsdos/shlib_version new file mode 100644 index 000000000000..fcc3a192fc7c --- /dev/null +++ b/sys/rump/fs/lib/libmsdos/shlib_version @@ -0,0 +1,4 @@ +# $NetBSD: shlib_version,v 1.1 2008/08/05 14:42:03 pooka Exp $ +# +major=0 +minor=0 diff --git a/sys/rump/fs/lib/libmsdosfs/shlib_version b/sys/rump/fs/lib/libmsdosfs/shlib_version deleted file mode 100644 index ef974fe38fa3..000000000000 --- a/sys/rump/fs/lib/libmsdosfs/shlib_version +++ /dev/null @@ -1,4 +0,0 @@ -# $NetBSD: shlib_version,v 1.1 2008/07/29 13:17:43 pooka Exp $ -# -major=0 -minor=0