From 69538a48bf7fdbc8ad7f12d15e72b5ae4ffc0d1e Mon Sep 17 00:00:00 2001 From: fredb Date: Wed, 6 Feb 2002 00:45:53 +0000 Subject: [PATCH] Update the GENERIC and GENERICSBC kernels to conform to current fashion: - - Disable `options DIAGNOSTIC' by default, as the checks are reported to be not really cheap. - - Add `options COMPAT_AOUT_M68K', commented out, in preparation for ELF. - - Remove `options EXEC_ELF32' from the kernel config. You can't just build an ELF kernel -- you need to update your toolchain, and then, once you go ELF, it's not an option, so it needs to go in std.mac68k, as on the other m68k ports. - - Comment out `options COMPAT_SUNOS'. This hasn't been reported to work for a long time, so it's not very useful in GENERIC. - - Enable `options IPFILTER_LOG', to go along with the `options GATEWAY' and `pseudo-device ipfilter' motif. --- sys/arch/mac68k/conf/GENERIC | 17 ++++++++++------- sys/arch/mac68k/conf/GENERICSBC | 19 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 600b451766dc..ee97445e417d 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.120 2002/01/27 13:23:19 jdolecek Exp $ +# $NetBSD: GENERIC,v 1.121 2002/02/06 00:45:53 fredb Exp $ # # GENERIC machine description file # @@ -20,7 +20,7 @@ include "arch/mac68k/conf/std.mac68k" -#ident "GENERIC-$Revision: 1.120 $" +#ident "GENERIC-$Revision: 1.121 $" maxusers 16 # estimated number of users @@ -57,7 +57,7 @@ options LKM # loadable kernel modules #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) # Diagnostic/debugging support options -options DIAGNOSTIC # cheap kernel consistency checks +#options DIAGNOSTIC # cheap kernel consistency checks #options DEBUG # expensive debugging checks/support options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger @@ -78,11 +78,13 @@ options COMPAT_14 # NetBSD 1.4, options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_SUNOS # compatibility with SunOS 4.x binaries -#options COMPAT_SVR4 # compatibility with SVR4 binaries -#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries +# The following is needed to run pre-NetBSD 1.6 binaries under ELF. +#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out + #options COMPAT_LINUX # compatibility with Linux/m68k binaries -#options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) +#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries +#options COMPAT_SUNOS # compatibility with SunOS 4.x binaries +#options COMPAT_SVR4 # compatibility with SVR4 binaries # File systems file-system FFS # UFS @@ -128,6 +130,7 @@ options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) options PFIL_HOOKS # pfil(9) packet filter hooks +options IPFILTER_LOG # ipmon(8) log support #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG # These options enable verbose messages for several subsystems. diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC index d429cd12d56f..c49dc2881909 100644 --- a/sys/arch/mac68k/conf/GENERICSBC +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -1,10 +1,10 @@ -# $NetBSD: GENERICSBC,v 1.11 2002/01/27 13:23:20 jdolecek Exp $ +# $NetBSD: GENERICSBC,v 1.12 2002/02/06 00:45:54 fredb Exp $ # # GENERICSBC include "arch/mac68k/conf/std.mac68k" -#ident "GENERICSBC-$Revision: 1.11 $" +#ident "GENERICSBC-$Revision: 1.12 $" maxusers 16 # estimated number of users @@ -41,10 +41,10 @@ options LKM # loadable kernel modules #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) # Diagnostic/debugging support options -options DIAGNOSTIC # cheap kernel consistency checks +#options DIAGNOSTIC # cheap kernel consistency checks #options DEBUG # expensive debugging checks/support options KMEMSTATS # kernel memory statistics (vmstat -m) -options DDB # in-kernel debugger +options DDB # in-kernel debugger #options DDB_HISTORY_SIZE=100 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEV=0xc01 # kgdb device number (dev_t) @@ -62,11 +62,13 @@ options COMPAT_14 # NetBSD 1.4, options COMPAT_43 # and 4.3BSD #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_SUNOS # compatibility with SunOS 4.x binaries -#options COMPAT_SVR4 # compatibility with SVR4 binaries -#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries +# The following is needed to run pre-NetBSD 1.6 binaries under ELF. +#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out + #options COMPAT_LINUX # compatibility with Linux/m68k binaries -#options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) +#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries +#options COMPAT_SUNOS # compatibility with SunOS 4.x binaries +#options COMPAT_SVR4 # compatibility with SVR4 binaries # File systems file-system FFS # UFS @@ -112,6 +114,7 @@ options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) options PFIL_HOOKS # pfil(9) packet filter hooks +options IPFILTER_LOG # ipmon(8) log support #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG # These options enable verbose messages for several subsystems.