Make more things (HPFS, *_ICONV) buildable into the kernel.

diff --git a/sys/conf/files b/sys/conf/files
index 19fbb48..1e3908f 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -858,6 +858,7 @@ vfs/isofs/cd9660/cd9660_rrip.c      optional cd9660
 vfs/isofs/cd9660/cd9660_util.c optional cd9660
 vfs/isofs/cd9660/cd9660_vfsops.c       optional cd9660
 vfs/isofs/cd9660/cd9660_vnops.c        optional cd9660
+vfs/isofs/cd9660/cd9660_iconv/cd9660_iconv.c   optional cd9660_iconv
 vfs/udf/osta.c                 optional udf
 vfs/udf/udf_vfsops.c           optional udf
 vfs/udf/udf_vnops.c            optional udf
@@ -1049,17 +1050,25 @@ vfs/procfs/procfs_rlimit.c      optional procfs
 vfs/union/union_subr.c         optional union
 vfs/union/union_vfsops.c       optional union
 vfs/union/union_vnops.c                optional union
+vfs/hpfs/hpfs_alsubr.c         optional hpfs
+vfs/hpfs/hpfs_hash.c           optional hpfs
+vfs/hpfs/hpfs_lookup.c         optional hpfs
+vfs/hpfs/hpfs_subr.c           optional hpfs
+vfs/hpfs/hpfs_vfsops.c         optional hpfs
+vfs/hpfs/hpfs_vnops.c          optional hpfs
 vfs/msdosfs/msdosfs_conv.c     optional nowerror msdosfs
 vfs/msdosfs/msdosfs_denode.c   optional msdosfs
 vfs/msdosfs/msdosfs_fat.c      optional msdosfs
 vfs/msdosfs/msdosfs_lookup.c   optional msdosfs
 vfs/msdosfs/msdosfs_vfsops.c   optional msdosfs
 vfs/msdosfs/msdosfs_vnops.c    optional msdosfs
-vfs/ntfs/ntfs_vfsops.c         optional ntfs
-vfs/ntfs/ntfs_vnops.c          optional ntfs
-vfs/ntfs/ntfs_subr.c           optional ntfs
+vfs/msdosfs/msdosfs_iconv/msdosfs_iconv.c      optional msdosfs_iconv
 vfs/ntfs/ntfs_compr.c          optional ntfs
 vfs/ntfs/ntfs_ihash.c          optional ntfs
+vfs/ntfs/ntfs_subr.c           optional ntfs
+vfs/ntfs/ntfs_vfsops.c         optional ntfs
+vfs/ntfs/ntfs_vnops.c          optional ntfs
+vfs/ntfs/ntfs_iconv/ntfs_iconv.c       optional ntfs_iconv
 net/altq/altq_cbq.c            optional altq
 net/altq/altq_hfsc.c           optional altq
 net/altq/altq_priq.c           optional altq

diff --git a/sys/conf/options b/sys/conf/options
index 5409cb1..c2a0596 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -142,6 +142,7 @@ INCLUDE_CONFIG_FILE opt_config.h
 # options in a never-included header.
 EXT2FS         opt_dontuse.h
 FDESC          opt_dontuse.h
+HPFS           opt_dontuse.h
 MFS            opt_dontuse.h
 MSDOSFS                opt_dontuse.h
 NULLFS         opt_dontuse.h
@@ -164,6 +165,11 @@ USERFS
 TMPFS
 HAMMER
 
+# filesystems and libiconv bridge
+CD9660_ICONV   opt_dontuse.h
+MSDOSFS_ICONV  opt_dontuse.h
+NTFS_ICONV     opt_dontuse.h
+
 # If you are following the conditions in the copyright,
 # you can enable soft-updates which will speed up a lot of things
 # and make the system safer from crashes at the same time.

diff --git a/sys/config/LINT b/sys/config/LINT
index 489477f..f32602c 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -745,6 +745,7 @@ options     NFS                     #Network filesystem
 #options       NFS_NOSERVER            #Disable the NFS-server code.
 options        CD9660                  #ISO 9660 filesystem
 options        FDESC                   #File descriptor filesystem
+options        HPFS                    #OS/2 File system
 options        MSDOSFS                 #MS DOS filesystem
 options        NTFS                    #NT filesystem
 options        NULLFS                  #NULL filesystem
@@ -834,6 +835,12 @@ options    EXT2FS
 # unsuitable for inclusion on machines with untrusted local users.
 options        VFS_AIO
 
+# Optional character code conversion support with LIBICONV.
+# Each option requires their base file system and LIBICONV.
+options        CD9660_ICONV
+options        MSDOSFS_ICONV
+options        NTFS_ICONV
+
 \f
 #####################################################################
 # POSIX P1003.1B