Sat May 2 01:15:54 2009 UTC ()
Merge librumpfs_ufs into librumpfs_ffs.  This reflects what happened
with the ffs kernel module and follows the trend of retiring ufs.
It also allows to get rid of a special case kludge in runtime module
loading, since ufs was not really a module.  librumpfs_ufs is now
obsoleted and ffs consumers should be linked solely against
librumpfs_ffs.


(pooka)
diff -r1.170 -r1.171 src/distrib/sets/lists/base/shl.elf
diff -r1.468 -r1.469 src/distrib/sets/lists/base/shl.mi
diff -r1.1249 -r1.1250 src/distrib/sets/lists/comp/mi
diff -r1.79 -r1.80 src/distrib/sets/lists/comp/shl.mi
diff -r1.24 -r1.25 src/lib/libukfs/ukfs.c
diff -r1.12 -r1.13 src/sys/rump/fs/Makefile.rumpfs
diff -r1.8 -r1.9 src/sys/rump/fs/lib/libffs/Makefile
diff -r1.7 -r0 src/sys/rump/fs/lib/libufs/Makefile
diff -r1.1 -r0 src/sys/rump/fs/lib/libufs/fs_ffs.h
diff -r1.1 -r0 src/sys/rump/fs/lib/libufs/shlib_version
diff -r1.3 -r1.4 src/tests/fs/ffs/Makefile
diff -r1.4 -r1.5 src/usr.sbin/puffs/rump_ext2fs/Makefile
diff -r1.3 -r1.4 src/usr.sbin/puffs/rump_ffs/Makefile
diff -r1.3 -r1.4 src/usr.sbin/puffs/rump_lfs/Makefile
cvs diff -r1.170 -r1.171 src/distrib/sets/lists/base/Attic/shl.elf (expand / switch to unified diff)

--- src/distrib/sets/lists/base/Attic/shl.elf 2009/05/01 22:59:52 1.170
+++ src/distrib/sets/lists/base/Attic/shl.elf 2009/05/02 01:15:54 1.171
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.elf,v 1.170 2009/05/01 22:59:52 agc Exp $ 1# $NetBSD: shl.elf,v 1.171 2009/05/02 01:15:54 pooka Exp $
2# 2#
3# Note: Do not mark "old" major and major.minor shared libraries as 3# Note: Do not mark "old" major and major.minor shared libraries as
4# "obsolete"; just remove the entry, as third-party applications 4# "obsolete"; just remove the entry, as third-party applications
5# may be linked against the old major shared library, and 5# may be linked against the old major shared library, and
6# that is a symlink to the old major.minor shared library. 6# that is a symlink to the old major.minor shared library.
7# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 7# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
8# Exceptions to this rule may include shared libraries that 8# Exceptions to this rule may include shared libraries that
9# are dlopen()ed at run-time, such as extra locales, etc. 9# are dlopen()ed at run-time, such as extra locales, etc.
10# 10#
11# Note: libtermcap and libtermlib are hardlinked and share the same version. 11# Note: libtermcap and libtermlib are hardlinked and share the same version.
12# 12#
13./lib/libc.so base-sys-shlib dynamicroot 13./lib/libc.so base-sys-shlib dynamicroot
14./lib/libc.so.12 base-sys-shlib dynamicroot 14./lib/libc.so.12 base-sys-shlib dynamicroot
@@ -238,28 +238,28 @@ @@ -238,28 +238,28 @@
238./usr/lib/librumpfs_msdos.so.0 base-rump-shlib 238./usr/lib/librumpfs_msdos.so.0 base-rump-shlib
239./usr/lib/librumpfs_nfs.so base-rump-shlib 239./usr/lib/librumpfs_nfs.so base-rump-shlib
240./usr/lib/librumpfs_nfs.so.0 base-rump-shlib 240./usr/lib/librumpfs_nfs.so.0 base-rump-shlib
241./usr/lib/librumpfs_ntfs.so base-rump-shlib 241./usr/lib/librumpfs_ntfs.so base-rump-shlib
242./usr/lib/librumpfs_ntfs.so.0 base-rump-shlib 242./usr/lib/librumpfs_ntfs.so.0 base-rump-shlib
243./usr/lib/librumpfs_syspuffs.so base-rump-shlib 243./usr/lib/librumpfs_syspuffs.so base-rump-shlib
244./usr/lib/librumpfs_syspuffs.so.0 base-rump-shlib 244./usr/lib/librumpfs_syspuffs.so.0 base-rump-shlib
245./usr/lib/librumpfs_sysvbfs.so base-rump-shlib 245./usr/lib/librumpfs_sysvbfs.so base-rump-shlib
246./usr/lib/librumpfs_sysvbfs.so.0 base-rump-shlib 246./usr/lib/librumpfs_sysvbfs.so.0 base-rump-shlib
247./usr/lib/librumpfs_tmpfs.so base-rump-shlib 247./usr/lib/librumpfs_tmpfs.so base-rump-shlib
248./usr/lib/librumpfs_tmpfs.so.0 base-rump-shlib 248./usr/lib/librumpfs_tmpfs.so.0 base-rump-shlib
249./usr/lib/librumpfs_udf.so base-rump-shlib 249./usr/lib/librumpfs_udf.so base-rump-shlib
250./usr/lib/librumpfs_udf.so.0 base-rump-shlib 250./usr/lib/librumpfs_udf.so.0 base-rump-shlib
251./usr/lib/librumpfs_ufs.so base-rump-shlib 251./usr/lib/librumpfs_ufs.so base-obsolete obsolete
252./usr/lib/librumpfs_ufs.so.0 base-rump-shlib 252./usr/lib/librumpfs_ufs.so.0 base-obsolete obsolete
253./usr/lib/librumpnet.so base-rump-shlib 253./usr/lib/librumpnet.so base-rump-shlib
254./usr/lib/librumpnet.so.0 base-rump-shlib 254./usr/lib/librumpnet.so.0 base-rump-shlib
255./usr/lib/librumpnet_local.so base-rump-shlib 255./usr/lib/librumpnet_local.so base-rump-shlib
256./usr/lib/librumpnet_local.so.0 base-rump-shlib 256./usr/lib/librumpnet_local.so.0 base-rump-shlib
257./usr/lib/librumpnet_net.so base-rump-shlib 257./usr/lib/librumpnet_net.so base-rump-shlib
258./usr/lib/librumpnet_net.so.0 base-rump-shlib 258./usr/lib/librumpnet_net.so.0 base-rump-shlib
259./usr/lib/librumpnet_netinet.so base-rump-shlib 259./usr/lib/librumpnet_netinet.so base-rump-shlib
260./usr/lib/librumpnet_netinet.so.0 base-rump-shlib 260./usr/lib/librumpnet_netinet.so.0 base-rump-shlib
261./usr/lib/librumpnet_shmif.so base-rump-shlib 261./usr/lib/librumpnet_shmif.so base-rump-shlib
262./usr/lib/librumpnet_shmif.so.0 base-rump-shlib 262./usr/lib/librumpnet_shmif.so.0 base-rump-shlib
263./usr/lib/librumpnet_sockin.so base-rump-shlib 263./usr/lib/librumpnet_sockin.so base-rump-shlib
264./usr/lib/librumpnet_sockin.so.0 base-rump-shlib 264./usr/lib/librumpnet_sockin.so.0 base-rump-shlib
265./usr/lib/librumpnet_virtif.so base-rump-shlib 265./usr/lib/librumpnet_virtif.so base-rump-shlib
cvs diff -r1.468 -r1.469 src/distrib/sets/lists/base/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/shl.mi 2009/05/01 22:59:52 1.468
+++ src/distrib/sets/lists/base/shl.mi 2009/05/02 01:15:54 1.469
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.468 2009/05/01 22:59:52 agc Exp $ 1# $NetBSD: shl.mi,v 1.469 2009/05/02 01:15:54 pooka Exp $
2# 2#
3# Note: Don't delete entries from here - mark them as "obsolete" instead, 3# Note: Don't delete entries from here - mark them as "obsolete" instead,
4# unless otherwise stated below. 4# unless otherwise stated below.
5# 5#
6# Note: Do not mark "old" major and major.minor shared libraries as 6# Note: Do not mark "old" major and major.minor shared libraries as
7# "obsolete"; just remove the entry, as third-party applications 7# "obsolete"; just remove the entry, as third-party applications
8# may be linked against the old major shared library, and 8# may be linked against the old major shared library, and
9# that is a symlink to the old major.minor shared library. 9# that is a symlink to the old major.minor shared library.
10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
11# Exceptions to this rule may include shared libraries that 11# Exceptions to this rule may include shared libraries that
12# are dlopen()ed at run-time, such as extra locales, etc. 12# are dlopen()ed at run-time, such as extra locales, etc.
13# 13#
14# Note: libtermcap and libtermlib are hardlinked and share the same version. 14# Note: libtermcap and libtermlib are hardlinked and share the same version.
@@ -121,27 +121,27 @@ @@ -121,27 +121,27 @@
121./usr/lib/librumpfs_cd9660.so.0.0 base-rump-shlib 121./usr/lib/librumpfs_cd9660.so.0.0 base-rump-shlib
122./usr/lib/librumpfs_efs.so.0.0 base-rump-shlib 122./usr/lib/librumpfs_efs.so.0.0 base-rump-shlib
123./usr/lib/librumpfs_ext2fs.so.0.0 base-rump-shlib 123./usr/lib/librumpfs_ext2fs.so.0.0 base-rump-shlib
124./usr/lib/librumpfs_ffs.so.0.0 base-rump-shlib 124./usr/lib/librumpfs_ffs.so.0.0 base-rump-shlib
125./usr/lib/librumpfs_hfs.so.0.0 base-rump-shlib 125./usr/lib/librumpfs_hfs.so.0.0 base-rump-shlib
126./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib 126./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib
127./usr/lib/librumpfs_msdos.so.0.0 base-rump-shlib 127./usr/lib/librumpfs_msdos.so.0.0 base-rump-shlib
128./usr/lib/librumpfs_nfs.so.0.0 base-rump-shlib 128./usr/lib/librumpfs_nfs.so.0.0 base-rump-shlib
129./usr/lib/librumpfs_ntfs.so.0.0 base-rump-shlib 129./usr/lib/librumpfs_ntfs.so.0.0 base-rump-shlib
130./usr/lib/librumpfs_syspuffs.so.0.0 base-rump-shlib 130./usr/lib/librumpfs_syspuffs.so.0.0 base-rump-shlib
131./usr/lib/librumpfs_sysvbfs.so.0.0 base-rump-shlib 131./usr/lib/librumpfs_sysvbfs.so.0.0 base-rump-shlib
132./usr/lib/librumpfs_tmpfs.so.0.0 base-rump-shlib 132./usr/lib/librumpfs_tmpfs.so.0.0 base-rump-shlib
133./usr/lib/librumpfs_udf.so.0.0 base-rump-shlib 133./usr/lib/librumpfs_udf.so.0.0 base-rump-shlib
134./usr/lib/librumpfs_ufs.so.0.0 base-rump-shlib 134./usr/lib/librumpfs_ufs.so.0.0 base-obsolete obsolete
135./usr/lib/librumpnet.so.0.0 base-rump-shlib 135./usr/lib/librumpnet.so.0.0 base-rump-shlib
136./usr/lib/librumpnet_local.so.0.0 base-rump-shlib 136./usr/lib/librumpnet_local.so.0.0 base-rump-shlib
137./usr/lib/librumpnet_net.so.0.0 base-rump-shlib 137./usr/lib/librumpnet_net.so.0.0 base-rump-shlib
138./usr/lib/librumpnet_netinet.so.0.0 base-rump-shlib 138./usr/lib/librumpnet_netinet.so.0.0 base-rump-shlib
139./usr/lib/librumpnet_shmif.so.0.0 base-rump-shlib 139./usr/lib/librumpnet_shmif.so.0.0 base-rump-shlib
140./usr/lib/librumpnet_sockin.so.0.0 base-rump-shlib 140./usr/lib/librumpnet_sockin.so.0.0 base-rump-shlib
141./usr/lib/librumpnet_virtif.so.0.0 base-rump-shlib 141./usr/lib/librumpnet_virtif.so.0.0 base-rump-shlib
142./usr/lib/librumpuser.so.0.0 base-rump-shlib 142./usr/lib/librumpuser.so.0.0 base-rump-shlib
143./usr/lib/librumpvfs.so.0.0 base-rump-shlib 143./usr/lib/librumpvfs.so.0.0 base-rump-shlib
144./usr/lib/libsdp.so.3.0 base-sys-shlib 144./usr/lib/libsdp.so.3.0 base-sys-shlib
145./usr/lib/libskey.so.2.0 base-sys-shlib skey 145./usr/lib/libskey.so.2.0 base-sys-shlib skey
146./usr/lib/libsl.so.4.0 base-krb5-shlib kerberos 146./usr/lib/libsl.so.4.0 base-krb5-shlib kerberos
147./usr/lib/libss.so.6.0 base-krb5-shlib kerberos 147./usr/lib/libss.so.6.0 base-krb5-shlib kerberos
cvs diff -r1.1249 -r1.1250 src/distrib/sets/lists/comp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/mi 2009/05/01 22:59:52 1.1249
+++ src/distrib/sets/lists/comp/mi 2009/05/02 01:15:54 1.1250
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.1249 2009/05/01 22:59:52 agc Exp $ 1# $NetBSD: mi,v 1.1250 2009/05/02 01:15:54 pooka Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.comp comp-sys-root 5./etc/mtree/set.comp comp-sys-root
6./usr/bin/addr2line comp-debug-bin bfd 6./usr/bin/addr2line comp-debug-bin bfd
7./usr/bin/ar comp-util-bin bfd 7./usr/bin/ar comp-util-bin bfd
8./usr/bin/as comp-util-bin bfd 8./usr/bin/as comp-util-bin bfd
9./usr/bin/asa comp-fortran-bin 9./usr/bin/asa comp-fortran-bin
10./usr/bin/atf-compile comp-atf-bin 10./usr/bin/atf-compile comp-atf-bin
11./usr/bin/c++ comp-cxx-bin gcccmds 11./usr/bin/c++ comp-cxx-bin gcccmds
12./usr/bin/c++filt comp-cxx-bin bfd 12./usr/bin/c++filt comp-cxx-bin bfd
13./usr/bin/c89 comp-c-bin 13./usr/bin/c89 comp-c-bin
14./usr/bin/c99 comp-c-bin 14./usr/bin/c99 comp-c-bin
@@ -2539,29 +2539,29 @@ @@ -2539,29 +2539,29 @@
2539./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile 2539./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile
2540./usr/lib/librumpfs_syspuffs.a comp-c-lib 2540./usr/lib/librumpfs_syspuffs.a comp-c-lib
2541./usr/lib/librumpfs_syspuffs_g.a -unknown- debuglib 2541./usr/lib/librumpfs_syspuffs_g.a -unknown- debuglib
2542./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib profile 2542./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib profile
2543./usr/lib/librumpfs_sysvbfs.a comp-c-lib 2543./usr/lib/librumpfs_sysvbfs.a comp-c-lib
2544./usr/lib/librumpfs_sysvbfs_g.a -unknown- debuglib 2544./usr/lib/librumpfs_sysvbfs_g.a -unknown- debuglib
2545./usr/lib/librumpfs_sysvbfs_p.a comp-c-proflib profile 2545./usr/lib/librumpfs_sysvbfs_p.a comp-c-proflib profile
2546./usr/lib/librumpfs_tmpfs.a comp-c-lib 2546./usr/lib/librumpfs_tmpfs.a comp-c-lib
2547./usr/lib/librumpfs_tmpfs_g.a -unknown- debuglib 2547./usr/lib/librumpfs_tmpfs_g.a -unknown- debuglib
2548./usr/lib/librumpfs_tmpfs_p.a comp-c-proflib profile 2548./usr/lib/librumpfs_tmpfs_p.a comp-c-proflib profile
2549./usr/lib/librumpfs_udf.a comp-c-lib 2549./usr/lib/librumpfs_udf.a comp-c-lib
2550./usr/lib/librumpfs_udf_g.a -unknown- debuglib 2550./usr/lib/librumpfs_udf_g.a -unknown- debuglib
2551./usr/lib/librumpfs_udf_p.a comp-c-proflib profile 2551./usr/lib/librumpfs_udf_p.a comp-c-proflib profile
2552./usr/lib/librumpfs_ufs.a comp-c-lib 2552./usr/lib/librumpfs_ufs.a comp-obsolete obsolete
2553./usr/lib/librumpfs_ufs_g.a -unknown- debuglib 2553./usr/lib/librumpfs_ufs_g.a comp-obsolete obsolete
2554./usr/lib/librumpfs_ufs_p.a comp-c-proflib profile 2554./usr/lib/librumpfs_ufs_p.a comp-obsolete obsolete
2555./usr/lib/librumpnet.a comp-c-lib 2555./usr/lib/librumpnet.a comp-c-lib
2556./usr/lib/librumpnet_g.a -unknown- debuglib 2556./usr/lib/librumpnet_g.a -unknown- debuglib
2557./usr/lib/librumpnet_local.a comp-c-lib 2557./usr/lib/librumpnet_local.a comp-c-lib
2558./usr/lib/librumpnet_local_g.a -unknown- debuglib 2558./usr/lib/librumpnet_local_g.a -unknown- debuglib
2559./usr/lib/librumpnet_local_p.a comp-c-proflib profile 2559./usr/lib/librumpnet_local_p.a comp-c-proflib profile
2560./usr/lib/librumpnet_net.a comp-c-lib 2560./usr/lib/librumpnet_net.a comp-c-lib
2561./usr/lib/librumpnet_net_g.a -unknown- debuglib 2561./usr/lib/librumpnet_net_g.a -unknown- debuglib
2562./usr/lib/librumpnet_net_p.a comp-c-proflib profile 2562./usr/lib/librumpnet_net_p.a comp-c-proflib profile
2563./usr/lib/librumpnet_netinet.a comp-c-lib 2563./usr/lib/librumpnet_netinet.a comp-c-lib
2564./usr/lib/librumpnet_netinet_g.a -unknown- debuglib 2564./usr/lib/librumpnet_netinet_g.a -unknown- debuglib
2565./usr/lib/librumpnet_netinet_p.a comp-c-proflib profile 2565./usr/lib/librumpnet_netinet_p.a comp-c-proflib profile
2566./usr/lib/librumpnet_p.a comp-c-proflib profile 2566./usr/lib/librumpnet_p.a comp-c-proflib profile
2567./usr/lib/librumpnet_shmif.a comp-c-lib 2567./usr/lib/librumpnet_shmif.a comp-c-lib
cvs diff -r1.79 -r1.80 src/distrib/sets/lists/comp/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/shl.mi 2009/05/01 22:59:52 1.79
+++ src/distrib/sets/lists/comp/shl.mi 2009/05/02 01:15:54 1.80
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.79 2009/05/01 22:59:52 agc Exp $ 1# $NetBSD: shl.mi,v 1.80 2009/05/02 01:15:54 pooka Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./usr/lib/crtbeginT.o comp-c-lib 5./usr/lib/crtbeginT.o comp-c-lib
6./usr/lib/libarchive_pic.a comp-c-piclib 6./usr/lib/libarchive_pic.a comp-c-piclib
7./usr/lib/libasn1_pic.a comp-c-piclib kerberos 7./usr/lib/libasn1_pic.a comp-c-piclib kerberos
8./usr/lib/libatf_pic.a comp-obsolete obsolete 8./usr/lib/libatf_pic.a comp-obsolete obsolete
9./usr/lib/libatf-c_pic.a comp-atf-piclib 9./usr/lib/libatf-c_pic.a comp-atf-piclib
10./usr/lib/libatf-c++_pic.a comp-atf-piclib 10./usr/lib/libatf-c++_pic.a comp-atf-piclib
11./usr/lib/libbind9_pic.a comp-bind-piclib 11./usr/lib/libbind9_pic.a comp-bind-piclib
12./usr/lib/libbluetooth_pic.a comp-c-piclib 12./usr/lib/libbluetooth_pic.a comp-c-piclib
13./usr/lib/libbsdmalloc_pic.a comp-c-piclib 13./usr/lib/libbsdmalloc_pic.a comp-c-piclib
14./usr/lib/libbz2_pic.a comp-c-piclib 14./usr/lib/libbz2_pic.a comp-c-piclib
@@ -84,27 +84,27 @@ @@ -84,27 +84,27 @@
84./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib 84./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib
85./usr/lib/librumpfs_efs_pic.a comp-c-piclib 85./usr/lib/librumpfs_efs_pic.a comp-c-piclib
86./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib 86./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib
87./usr/lib/librumpfs_ffs_pic.a comp-c-piclib 87./usr/lib/librumpfs_ffs_pic.a comp-c-piclib
88./usr/lib/librumpfs_hfs_pic.a comp-c-piclib 88./usr/lib/librumpfs_hfs_pic.a comp-c-piclib
89./usr/lib/librumpfs_lfs_pic.a comp-c-piclib 89./usr/lib/librumpfs_lfs_pic.a comp-c-piclib
90./usr/lib/librumpfs_msdos_pic.a comp-c-piclib 90./usr/lib/librumpfs_msdos_pic.a comp-c-piclib
91./usr/lib/librumpfs_nfs_pic.a comp-c-piclib 91./usr/lib/librumpfs_nfs_pic.a comp-c-piclib
92./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib 92./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib
93./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib 93./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib
94./usr/lib/librumpfs_sysvbfs_pic.a comp-c-piclib 94./usr/lib/librumpfs_sysvbfs_pic.a comp-c-piclib
95./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib 95./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib
96./usr/lib/librumpfs_udf_pic.a comp-c-piclib 96./usr/lib/librumpfs_udf_pic.a comp-c-piclib
97./usr/lib/librumpfs_ufs_pic.a comp-c-piclib 97./usr/lib/librumpfs_ufs_pic.a comp-obsolete obsolete
98./usr/lib/librumpnet_pic.a comp-c-piclib 98./usr/lib/librumpnet_pic.a comp-c-piclib
99./usr/lib/librumpnet_local_pic.a comp-c-piclib 99./usr/lib/librumpnet_local_pic.a comp-c-piclib
100./usr/lib/librumpnet_net_pic.a comp-c-piclib 100./usr/lib/librumpnet_net_pic.a comp-c-piclib
101./usr/lib/librumpnet_netinet_pic.a comp-c-piclib 101./usr/lib/librumpnet_netinet_pic.a comp-c-piclib
102./usr/lib/librumpnet_shmif_pic.a comp-c-piclib 102./usr/lib/librumpnet_shmif_pic.a comp-c-piclib
103./usr/lib/librumpnet_sockin_pic.a comp-c-piclib 103./usr/lib/librumpnet_sockin_pic.a comp-c-piclib
104./usr/lib/librumpnet_virtif_pic.a comp-c-piclib 104./usr/lib/librumpnet_virtif_pic.a comp-c-piclib
105./usr/lib/librumpuser_pic.a comp-c-piclib 105./usr/lib/librumpuser_pic.a comp-c-piclib
106./usr/lib/librumpvfs_pic.a comp-c-piclib 106./usr/lib/librumpvfs_pic.a comp-c-piclib
107./usr/lib/libsdp_pic.a comp-c-piclib 107./usr/lib/libsdp_pic.a comp-c-piclib
108./usr/lib/libskey_pic.a comp-c-piclib skey 108./usr/lib/libskey_pic.a comp-c-piclib skey
109./usr/lib/libsl_pic.a comp-c-piclib kerberos 109./usr/lib/libsl_pic.a comp-c-piclib kerberos
110./usr/lib/libss_pic.a comp-c-piclib kerberos 110./usr/lib/libss_pic.a comp-c-piclib kerberos
cvs diff -r1.24 -r1.25 src/lib/libukfs/ukfs.c (expand / switch to unified diff)

--- src/lib/libukfs/ukfs.c 2009/04/26 22:23:01 1.24
+++ src/lib/libukfs/ukfs.c 2009/05/02 01:15:52 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ukfs.c,v 1.24 2009/04/26 22:23:01 pooka Exp $ */ 1/* $NetBSD: ukfs.c,v 1.25 2009/05/02 01:15:52 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2007, 2008 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2007, 2008 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Development of this software was supported by the 6 * Development of this software was supported by the
7 * Finnish Cultural Foundation. 7 * Finnish Cultural Foundation.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -662,62 +662,46 @@ ukfs_lutimes(struct ukfs *ukfs, const ch @@ -662,62 +662,46 @@ ukfs_lutimes(struct ukfs *ukfs, const ch
662} 662}
663 663
664/* 664/*
665 * Dynamic module support 665 * Dynamic module support
666 */ 666 */
667 667
668/* load one library */ 668/* load one library */
669 669
670/* 670/*
671 * XXX: the dlerror stuff isn't really threadsafe, but then again I 671 * XXX: the dlerror stuff isn't really threadsafe, but then again I
672 * can't protect against other threads calling dl*() outside of ukfs, 672 * can't protect against other threads calling dl*() outside of ukfs,
673 * so just live with it being flimsy 673 * so just live with it being flimsy
674 */ 674 */
675#define UFSLIB "librumpfs_ufs.so" 
676int 675int
677ukfs_modload(const char *fname) 676ukfs_modload(const char *fname)
678{ 677{
679 void *handle, *thesym; 678 void *handle, *thesym;
680 struct stat sb; 679 struct stat sb;
681 const char *p; 
682 int error; 680 int error;
683 681
684 if (stat(fname, &sb) == -1) 682 if (stat(fname, &sb) == -1)
685 return -1; 683 return -1;
686 684
687 handle = dlopen(fname, RTLD_GLOBAL); 685 handle = dlopen(fname, RTLD_GLOBAL);
688 if (handle == NULL) { 686 if (handle == NULL) {
689 const char *dlmsg = dlerror(); 687 const char *dlmsg = dlerror();
690 if (strstr(dlmsg, "Undefined symbol")) 688 if (strstr(dlmsg, "Undefined symbol"))
691 return 0; 689 return 0;
692 warnx("dlopen %s failed: %s\n", fname, dlmsg); 690 warnx("dlopen %s failed: %s\n", fname, dlmsg);
693 /* XXXerrno */ 691 /* XXXerrno */
694 return -1; 692 return -1;
695 } 693 }
696 694
697 /* 
698 * XXX: the ufs module is not loaded in the same fashion as the 
699 * others. But we can't do dlclose() for it, since that would 
700 * lead to not being able to load ffs/ext2fs/lfs. Hence hardcode 
701 * and kludge around the issue for now. But this should really 
702 * be fixed by fixing sys/ufs/ufs to be a kernel module. 
703 */ 
704 if ((p = strrchr(fname, '/')) != NULL) 
705 p++; 
706 else 
707 p = fname; 
708 if (strcmp(p, UFSLIB) == 0) 
709 return 1; 
710 
711 thesym = dlsym(handle, "__start_link_set_modules"); 695 thesym = dlsym(handle, "__start_link_set_modules");
712 if (thesym) { 696 if (thesym) {
713 error = rump_module_load(thesym); 697 error = rump_module_load(thesym);
714 if (error) 698 if (error)
715 goto errclose; 699 goto errclose;
716 return 1; 700 return 1;
717 } 701 }
718 error = EINVAL; 702 error = EINVAL;
719 703
720 errclose: 704 errclose:
721 dlclose(handle); 705 dlclose(handle);
722 errno = error; 706 errno = error;
723 return -1; 707 return -1;
cvs diff -r1.12 -r1.13 src/sys/rump/fs/Attic/Makefile.rumpfs (expand / switch to unified diff)

--- src/sys/rump/fs/Attic/Makefile.rumpfs 2008/10/16 09:29:43 1.12
+++ src/sys/rump/fs/Attic/Makefile.rumpfs 2009/05/02 01:15:53 1.13
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
1# $NetBSD: Makefile.rumpfs,v 1.12 2008/10/16 09:29:43 pooka Exp $ 1# $NetBSD: Makefile.rumpfs,v 1.13 2009/05/02 01:15:53 pooka Exp $
2# 2#
3 3
4RUMPFSLIST= cd9660 efs ext2fs ffs hfs lfs msdos nfs ntfs syspuffs sysvbfs 4RUMPFSLIST= cd9660 efs ext2fs ffs hfs lfs msdos nfs ntfs syspuffs sysvbfs
5RUMPFSLIST+= tmpfs udf 5RUMPFSLIST+= tmpfs udf
6 6
7RUMPFSALL= ${RUMPFSLIST} ufs 7.for var in ${RUMPFSLIST}
8 
9.for var in ${RUMPFSALL} 
10RUMPFSLIBS+=lib${var} 8RUMPFSLIBS+=lib${var}
11RUMPFSLDADD+=-lrumpfs_${var} 9RUMPFSLDADD+=-lrumpfs_${var}
12.endfor 10.endfor
cvs diff -r1.8 -r1.9 src/sys/rump/fs/lib/libffs/Makefile (expand / switch to unified diff)

--- src/sys/rump/fs/lib/libffs/Makefile 2009/04/06 20:46:44 1.8
+++ src/sys/rump/fs/lib/libffs/Makefile 2009/05/02 01:15:53 1.9
@@ -1,16 +1,20 @@ @@ -1,16 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2009/04/06 20:46:44 pooka Exp $ 1# $NetBSD: Makefile,v 1.9 2009/05/02 01:15:53 pooka Exp $
2# 2#
3 3
4.PATH: ${.CURDIR}/../../../../ufs/ffs 4.PATH: ${.CURDIR}/../../../../ufs/ffs ${.CURDIR}/../../../../ufs/ufs
5 5
6LIB= rumpfs_ffs 6LIB= rumpfs_ffs
7 7
8SRCS= ffs_alloc.c ffs_appleufs.c ffs_balloc.c ffs_bswap.c ffs_inode.c \ 8SRCS= ffs_alloc.c ffs_appleufs.c ffs_balloc.c ffs_bswap.c ffs_inode.c \
9 ffs_snapshot.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c \ 9 ffs_snapshot.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c \
10 ffs_wapbl.c 10 ffs_wapbl.c
11 11
 12SRCS+= ufs_bmap.c ufs_dirhash.c ufs_ihash.c ufs_inode.c ufs_lookup.c \
 13 ufs_vfsops.c ufs_vnops.c ufs_wapbl.c
 14
12CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS 15CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS
 16CPPFLAGS+= -DUFS_DIRHASH -DWAPBL -DAPPLE_UFS
13CFLAGS+= -Wno-pointer-sign 17CFLAGS+= -Wno-pointer-sign
14 18
15.include <bsd.lib.mk> 19.include <bsd.lib.mk>
16.include <bsd.klinks.mk> 20.include <bsd.klinks.mk>
File Deleted: src/sys/rump/fs/lib/libufs/Attic/Makefile
File Deleted: src/sys/rump/fs/lib/libufs/Attic/fs_ffs.h
File Deleted: src/sys/rump/fs/lib/libufs/Attic/shlib_version
cvs diff -r1.3 -r1.4 src/tests/fs/ffs/Makefile (expand / switch to unified diff)

--- src/tests/fs/ffs/Makefile 2009/04/26 15:15:38 1.3
+++ src/tests/fs/ffs/Makefile 2009/05/02 01:15:54 1.4
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1# $NetBSD: Makefile,v 1.3 2009/04/26 15:15:38 pooka Exp $ 1# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:54 pooka Exp $
2# 2#
3 3
4TESTSDIR= ${TESTSBASE}/fs/ffs 4TESTSDIR= ${TESTSBASE}/fs/ffs
5WARNS= 4 5WARNS= 4
6 6
7TESTS_C= t_renamerace 7TESTS_C= t_renamerace
8 8
9LDADD.t_renamerace+= -lrumpfs_ffs -lrumpfs_ufs -lrumpvfs -lrump 9LDADD+= -lrumpfs_ffs -lrumpvfs -lrump -lrumpuser -lpthread
10LDADD.t_renamerace+= -lrumpuser -lpthread 
11 10
12.include <bsd.test.mk> 11.include <bsd.test.mk>
cvs diff -r1.4 -r1.5 src/usr.sbin/puffs/rump_ext2fs/Makefile (expand / switch to unified diff)

--- src/usr.sbin/puffs/rump_ext2fs/Makefile 2008/12/30 22:20:56 1.4
+++ src/usr.sbin/puffs/rump_ext2fs/Makefile 2009/05/02 01:15:53 1.5
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1# $NetBSD: Makefile,v 1.4 2008/12/30 22:20:56 pooka Exp $ 1# $NetBSD: Makefile,v 1.5 2009/05/02 01:15:53 pooka Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5.undef RUMPKMOD 
6 5
7MOUNTNAME= ext2fs 6MOUNTNAME= ext2fs
8 7
9LDADD+= -lrumpfs_ufs -lrumpfs_ffs 8LDADD+= -lrumpfs_ffs
10DPADD+= ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS} 9DPADD+= ${LIBRUMPFS_FFS}
11 10
12ISRUMP= # yea baby 11ISRUMP= # yea baby
13 12
14.include <bsd.prog.mk> 13.include <bsd.prog.mk>
cvs diff -r1.3 -r1.4 src/usr.sbin/puffs/rump_ffs/Makefile (expand / switch to unified diff)

--- src/usr.sbin/puffs/rump_ffs/Makefile 2008/12/30 22:20:56 1.3
+++ src/usr.sbin/puffs/rump_ffs/Makefile 2009/05/02 01:15:53 1.4
@@ -1,14 +1,10 @@ @@ -1,14 +1,10 @@
1# $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $ 1# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5.undef RUMPKMOD 
6 5
7MOUNTNAME= ffs 6MOUNTNAME= ffs
8 7
9LDADD+= -lrumpfs_ffs -lrumpfs_ufs 
10DPADD+= ${LIBRUMPFS_FFS} ${LIBRUMPFS_UFS} 
11 
12ISRUMP= # affirmative 8ISRUMP= # affirmative
13 9
14.include <bsd.prog.mk> 10.include <bsd.prog.mk>
cvs diff -r1.3 -r1.4 src/usr.sbin/puffs/rump_lfs/Makefile (expand / switch to unified diff)

--- src/usr.sbin/puffs/rump_lfs/Makefile 2008/12/30 22:20:56 1.3
+++ src/usr.sbin/puffs/rump_lfs/Makefile 2009/05/02 01:15:53 1.4
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1# $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $ 1# $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
2# 2#
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5.undef RUMPKMOD 
6 5
7MOUNTNAME= lfs 6MOUNTNAME= lfs
8 7
9LDADD+= -lrumpfs_lfs -lrumpfs_ufs -lrumpfs_ffs 8LDADD+= -lrumpfs_ffs
10DPADD+= ${LIBRUMPFS_LFS} ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS} 9DPADD+= ${LIBRUMPFS_FFS}
11 10
12ISRUMP= # don't deny it 11ISRUMP= # don't deny it
13 12
14.include <bsd.prog.mk> 13.include <bsd.prog.mk>