Module Name: src
Committed By: jym
Date: Wed Feb 16 03:16:58 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC INSTALL
Log Message:
Build certain file-systems and options(7) as module(7). 32 and 64 bits
support are still builtin, as well as FFS, NFS, TMPFS, and most COMPAT
code. Saves approx. 750kiB.
Reflect this in INSTALL kernel, where we have to support more file systems
statically.
See http://mail-index.netbsd.org/port-amd64/2011/02/13/msg001318.html
To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amd64/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.304 src/sys/arch/amd64/conf/GENERIC:1.305
--- src/sys/arch/amd64/conf/GENERIC:1.304 Mon Feb 14 08:50:39 2011
+++ src/sys/arch/amd64/conf/GENERIC Wed Feb 16 03:16:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.304 2011/02/14 08:50:39 hannken Exp $
+# $NetBSD: GENERIC,v 1.305 2011/02/16 03:16:57 jym Exp $
#
# GENERIC machine description file
#
@@ -22,10 +22,16 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.304 $"
+#ident "GENERIC-$Revision: 1.305 $"
maxusers 64 # estimated number of users
+no options COREDUMP # coredump support, built as module(7)
+# Common binary formats are statically compiled in by default.
+options EXEC_ELF32 # exec ELF 32-bits binaries
+#no options EXEC_ELF64 # exec ELF 64-bits binaries
+#no options EXEC_SCRIPT # exec #! scripts
+
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
@@ -65,6 +71,8 @@
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+no options AIO # POSIX asynchronous I/O, built as a module(7)
+no options MQUEUE # POSIX messsage queues, built as a module(7)
options MODULAR # new style module(7) framework
options USERCONF # userconf(4) support
@@ -119,9 +127,8 @@
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
-options COMPAT_LINUX
-options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
-options EXEC_ELF32
+#options COMPAT_LINUX
+#options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
@@ -131,29 +138,30 @@
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
-# File systems
file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
-file-system PROCFS # /proc
-file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system SMBFS # experimental - SMB/CIFS file-system
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
-#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-#file-system HFS # experimental - Apple HFS+ (read-only)
+file-system TMPFS # Efficient memory file-system
+# File systems, built as module(7)s by default
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+#file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PROCFS # /proc
+#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system PTYFS # /dev/ptm support
+#file-system UDF # experimental - OSTA UDF CD/DVD file-system
+#file-system HFS # experimental - Apple HFS+ (read-only)
+#file-system NILFS # experimental - NTT's NiLFS(2)
# File system options
options QUOTA # UFS quotas
@@ -1137,9 +1145,9 @@
pseudo-device agr # IEEE 802.3ad link aggregation
#
-# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+# accept filters, built as module(7)s by default
+#pseudo-device accf_data # "dataready" accept filter
+#pseudo-device accf_http # "httpready" accept filter
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
@@ -1156,7 +1164,7 @@
pseudo-device btuart # Bluetooth HCI UART (H4)
# a pseudo device needed for Coda # also needs CODA (above)
-pseudo-device vcoda 4 # coda minicache <-> venus comm.
+#pseudo-device vcoda 4 # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.83 src/sys/arch/amd64/conf/INSTALL:1.84
--- src/sys/arch/amd64/conf/INSTALL:1.83 Fri Feb 11 02:06:09 2011
+++ src/sys/arch/amd64/conf/INSTALL Wed Feb 16 03:16:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.83 2011/02/11 02:06:09 jmcneill Exp $
+# $NetBSD: INSTALL,v 1.84 2011/02/16 03:16:57 jym Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,16 @@
include "arch/amd64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.83 $"
+#ident "INSTALL-$Revision: 1.84 $"
+
+# INSTALL kernels do not have access to module(7)s. Compile some
+# file-systems statically.
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
