Module Name: src
Committed By: mrg
Date: Wed Mar 7 09:44:22 UTC 2018
Modified Files:
src/sys/arch/sun3/conf: GENERIC GENERIC3X
Log Message:
also disable SYSCTL_INCLUDE_DESCR.
copy sun3 disables to sun3x mostly. it has the same ufsboot 2MB limit.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/sun3/conf/GENERIC3X
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/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.177 src/sys/arch/sun3/conf/GENERIC:1.178
--- src/sys/arch/sun3/conf/GENERIC:1.177 Sat Mar 3 03:19:36 2018
+++ src/sys/arch/sun3/conf/GENERIC Wed Mar 7 09:44:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.177 2018/03/03 03:19:36 mrg Exp $
+# $NetBSD: GENERIC,v 1.178 2018/03/07 09:44:22 mrg Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.177 $"
+#ident "GENERIC-$Revision: 1.178 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -48,7 +48,7 @@ options SYSVSHM # System V shared memo
#options INSECURE # disable kernel security level
#options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.130 src/sys/arch/sun3/conf/GENERIC3X:1.131
--- src/sys/arch/sun3/conf/GENERIC3X:1.130 Tue Jan 23 14:47:56 2018
+++ src/sys/arch/sun3/conf/GENERIC3X Wed Mar 7 09:44:22 2018
@@ -1,13 +1,13 @@
-# $NetBSD: GENERIC3X,v 1.130 2018/01/23 14:47:56 sevan Exp $
+# $NetBSD: GENERIC3X,v 1.131 2018/03/07 09:44:22 mrg Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
include "arch/sun3/conf/std.sun3x"
-options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC3X-$Revision: 1.130 $"
+#ident "GENERIC3X-$Revision: 1.131 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -29,8 +29,8 @@ options SYSVSHM # System V shared memo
#options INSECURE # disable kernel security level
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
@@ -53,11 +53,13 @@ options DDB
#options SCSIVERBOSE # Verbose SCSI errors
# Compatibility options
-include "conf/compat_netbsd10.config"
-options COMPAT_AOUT_M68K # support for NetBSD a.out executables
+# Originally in NetBSD 1.0, but limited to 6.0 for size.
+#include "conf/compat_netbsd10.config"
+include "conf/compat_netbsd60.config"
+#options COMPAT_AOUT_M68K # support for NetBSD a.out executables
#options COMPAT_LINUX # can run Linux/m68k executables
-options EXEC_AOUT # support for a.out executables
-options COMPAT_SUNOS # can run SunOS 4.1.1 executables
+#options EXEC_AOUT # support for a.out executables
+#options COMPAT_SUNOS # can run SunOS 4.1.1 executables
#options COMPAT_SVR4 # can run SVR4 executables
# Filesystem options
@@ -65,28 +67,29 @@ file-system FFS # Berkeley Fast Filesys
file-system NFS # Sun NFS client support
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS FAT file system
-file-system FDESC # /dev/fd/*
-file-system KERNFS # /kern
+#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 UNION # union file system
file-system MFS # memory-based filesystem
file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+# Disabled as 20KB larger than MFS.
+#file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-options NFSSERVER # nfs server support
+#options NFSSERVER # nfs server support
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support
+#options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options FFS_NO_SNAPSHOT # No FFS snapshot support
# Networking options
options INET # IP protocol stack support
-options INET6 # IPV6
+#options INET6 # IPV6
#options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options GATEWAY # IP packet forwarding
@@ -227,8 +230,8 @@ uk* at scsibus? target ? lun ? # unknow
#
# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+#pseudo-device accf_data # "dataready" accept filter
+#pseudo-device accf_http # "httpready" accept filter
# Memory-disk drivers
pseudo-device md
