Module Name: src
Committed By: nia
Date: Wed Jan 20 13:22:08 UTC 2021
Modified Files:
src/sys/arch/amd64/conf: GENERIC MODULAR XEN3_DOM0 XEN3_DOMU
src/sys/arch/evbarm/conf: OPENBLOCKS_AX3
src/sys/arch/i386/conf: GENERIC MODULAR XEN3PAE_DOM0 XEN3PAE_DOMU
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/usermode/conf: GENERIC.common
src/sys/arch/zaurus/conf: GENERIC
Log Message:
remove compat_ossaudio from kernel modules
this is only useful with compat_linux and gets autoloaded when
compat_linux is loaded, so there's no reason to bake it into kernels
any more.
To generate a diff of this commit:
cvs rdiff -u -r1.581 -r1.582 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/conf/MODULAR
cvs rdiff -u -r1.185 -r1.186 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.1233 -r1.1234 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/MODULAR
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/zaurus/conf/GENERIC
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.581 src/sys/arch/amd64/conf/GENERIC:1.582
--- src/sys/arch/amd64/conf/GENERIC:1.581 Sat Jan 16 01:43:42 2021
+++ src/sys/arch/amd64/conf/GENERIC Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.581 2021/01/16 01:43:42 thorpej Exp $
+# $NetBSD: GENERIC,v 1.582 2021/01/20 13:22:08 nia Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.581 $"
+#ident "GENERIC-$Revision: 1.582 $"
maxusers 64 # estimated number of users
@@ -178,7 +178,6 @@ include "conf/compat_netbsd15.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
options EXEC_ELF32
Index: src/sys/arch/amd64/conf/MODULAR
diff -u src/sys/arch/amd64/conf/MODULAR:1.18 src/sys/arch/amd64/conf/MODULAR:1.19
--- src/sys/arch/amd64/conf/MODULAR:1.18 Mon Oct 19 19:33:01 2020
+++ src/sys/arch/amd64/conf/MODULAR Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.18 2020/10/19 19:33:01 christos Exp $
+# $NetBSD: MODULAR,v 1.19 2021/01/20 13:22:08 nia Exp $
#
# Try to exclude all the drivers in GENERIC that have been modularized
# XXX: incomplete
@@ -26,7 +26,6 @@ include "arch/amd64/conf/GENERIC"
-no options COMPAT_43 # and 4.3BSD
#options COMPAT_386BSD_MBRPART # recognize old partition ID
--no options COMPAT_OSSAUDIO
-no options COMPAT_NETBSD32
-no options EXEC_ELF32
-no options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.185 src/sys/arch/amd64/conf/XEN3_DOM0:1.186
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.185 Sun Sep 27 13:48:49 2020
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.185 2020/09/27 13:48:49 roy Exp $
+# $NetBSD: XEN3_DOM0,v 1.186 2021/01/20 13:22:08 nia Exp $
include "arch/amd64/conf/std.xen"
@@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.185 $"
+#ident "XEN3_DOM0-$Revision: 1.186 $"
maxusers 32 # estimated number of users
@@ -69,7 +69,6 @@ options DDB_COMMANDONENTER="show registe
include "conf/compat_netbsd15.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
options EXEC_ELF32
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.96 src/sys/arch/amd64/conf/XEN3_DOMU:1.97
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.96 Sun Sep 27 13:48:49 2020
+++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.96 2020/09/27 13:48:49 roy Exp $
+# $NetBSD: XEN3_DOMU,v 1.97 2021/01/20 13:22:08 nia Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOMU-$Revision: 1.96 $"
+#ident "XEN3_DOMU-$Revision: 1.97 $"
maxusers 32 # estimated number of users
@@ -59,7 +59,6 @@ options DDB_COMMANDONENTER="trace;show r
include "conf/compat_netbsd15.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
options EXEC_ELF32
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.34 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.35
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.34 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.34 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.35 2021/01/20 13:22:08 nia Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -94,8 +94,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
options SYSVMSG # System V-like message queues
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1233 src/sys/arch/i386/conf/GENERIC:1.1234
--- src/sys/arch/i386/conf/GENERIC:1.1233 Sun Sep 27 13:48:51 2020
+++ src/sys/arch/i386/conf/GENERIC Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1233 2020/09/27 13:48:51 roy Exp $
+# $NetBSD: GENERIC,v 1.1234 2021/01/20 13:22:08 nia Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1233 $"
+#ident "GENERIC-$Revision: 1.1234 $"
maxusers 64 # estimated number of users
@@ -144,8 +144,6 @@ options KDTRACE_HOOKS # kernel DTrace h
include "conf/compat_netbsd09.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/i386/conf/MODULAR
diff -u src/sys/arch/i386/conf/MODULAR:1.7 src/sys/arch/i386/conf/MODULAR:1.8
--- src/sys/arch/i386/conf/MODULAR:1.7 Sun Aug 16 10:27:47 2020
+++ src/sys/arch/i386/conf/MODULAR Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.7 2020/08/16 10:27:47 jdolecek Exp $
+# $NetBSD: MODULAR,v 1.8 2021/01/20 13:22:08 nia Exp $
#
# MODULAR kernel
# This kernel config prefers loading kernel drivers from file system.
@@ -12,10 +12,6 @@ no options AIO # POSIX asynchronous I/O
no options MQUEUE # POSIX messsage queues, built as a module
no options NFSSERVER # Network File System server
-# compatibility options, built as modules
-#
-no options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# build non boot critical file systems as modules
#
no file-system EXT2FS # second extended file system (linux)
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.33 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.34
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.33 Sun Sep 27 13:48:51 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.33 2020/09/27 13:48:51 roy Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.34 2021/01/20 13:22:08 nia Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -82,8 +82,6 @@ include "conf/compat_netbsd09.config"
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.16 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.17
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.16 Sun Sep 27 13:48:51 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.16 2020/09/27 13:48:51 roy Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.17 2021/01/20 13:22:08 nia Exp $
include "arch/i386/conf/std.xen"
@@ -66,8 +66,6 @@ include "conf/compat_netbsd09.config"
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.69 src/sys/arch/landisk/conf/GENERIC:1.70
--- src/sys/arch/landisk/conf/GENERIC:1.69 Sun Sep 27 13:48:52 2020
+++ src/sys/arch/landisk/conf/GENERIC Wed Jan 20 13:22:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.69 2020/09/27 13:48:52 roy Exp $
+# $NetBSD: GENERIC,v 1.70 2021/01/20 13:22:08 nia Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.69 $"
+#ident "GENERIC-$Revision: 1.70 $"
maxusers 16 # estimated number of users
@@ -80,7 +80,6 @@ options DDB_HISTORY_SIZE=512 # Enable h
# Compatibility options
include "conf/compat_netbsd16.config"
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
# Executable format options
options EXEC_COFF # COFF executables
Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.28 src/sys/arch/usermode/conf/GENERIC.common:1.29
--- src/sys/arch/usermode/conf/GENERIC.common:1.28 Tue Jun 5 20:02:42 2018
+++ src/sys/arch/usermode/conf/GENERIC.common Wed Jan 20 13:22:08 2021
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC.common,v 1.28 2018/06/05 20:02:42 reinoud Exp $
+# $NetBSD: GENERIC.common,v 1.29 2021/01/20 13:22:08 nia Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.28 $"
+#ident "GENERIC-$Revision: 1.29 $"
maxusers 32
makeoptions DEBUG="-O1 -g3"
@@ -29,7 +29,6 @@ options CPU_DEBUG
#options UVMHIST_PRINT
include "conf/compat_netbsd50.config"
-options COMPAT_OSSAUDIO
file-system FFS
file-system MFS
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.90 src/sys/arch/zaurus/conf/GENERIC:1.91
--- src/sys/arch/zaurus/conf/GENERIC:1.90 Wed Mar 25 17:06:19 2020
+++ src/sys/arch/zaurus/conf/GENERIC Wed Jan 20 13:22:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.90 2020/03/25 17:06:19 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.91 2021/01/20 13:22:07 nia Exp $
#
# GENERIC machine description file
#
@@ -90,7 +90,6 @@ options INET6 # IPv6
# Compatibility options
include "conf/compat_netbsd13.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
