Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make COMPAT_LINUX option disabled by default 

leave the option enabled only in amd64/i386 ALL kernels to make
sure it continues to be compilable also when included in kernel
This commit is contained in:
jdolecek 2020-08-16 10:27:47 +00:00
parent 1344fd3121
commit dd45d45423
28 changed files with 34 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/alpha/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.403 2020/08/01 08:20:47 maxv Exp $
# $NetBSD: GENERIC,v 1.404 2020/08/16 10:27:47 jdolecek Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
ident "GENERIC-$Revision: 1.403 $"
ident "GENERIC-$Revision: 1.404 $"
maxusers 32
@ -130,9 +130,6 @@ options PPP_FILTER # Active filter support for PPP (requires bpf)
# Binary compatibility with previous versions of NetBSD.
include "conf/compat_netbsd09.config"
# Linux binary compatibility
options COMPAT_LINUX
# System V-like message queues
options SYSVMSG

6
sys/arch/amd64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.574 2020/08/01 08:20:47 maxv Exp $
# $NetBSD: GENERIC,v 1.575 2020/08/16 10:27:47 jdolecek 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.574 $"
#ident "GENERIC-$Revision: 1.575 $"
maxusers 64 # estimated number of users
@ -180,8 +180,6 @@ include "conf/compat_netbsd15.config"
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
options COMPAT_LINUX
options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options EXEC_ELF32
# Wedge support

4
sys/arch/amd64/conf/MODULAR
View File

@ -1,4 +1,4 @@
# $NetBSD: MODULAR,v 1.15 2020/03/25 17:06:18 jdolecek Exp $
# $NetBSD: MODULAR,v 1.16 2020/08/16 10:27:47 jdolecek Exp $
#
# Try to exclude all the drivers in GENERIC that have been modularized
# XXX: incomplete
@ -30,8 +30,6 @@ options MODULAR_DEFAULT_AUTOLOAD
-no options COMPAT_OSSAUDIO
-no options COMPAT_NETBSD32
-no options COMPAT_LINUX
-no options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
-no options EXEC_ELF32
-no options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.

5
sys/arch/amd64/conf/NOCOMPAT
View File

@ -1,6 +1,6 @@
include "arch/amd64/conf/GENERIC"
#ident "NOCOMPAT-$Revision: 1.4 $"
#ident "NOCOMPAT-$Revision: 1.5 $"
no options SYSVMSG # System V-like message queues
no options SYSVSEM # System V-like semaphores
@ -33,7 +33,4 @@ no options COMPAT_15
no options COMPAT_OSSAUDIO
no options COMPAT_NETBSD32
no options COMPAT_LINUX
no options COMPAT_LINUX32 # requires COMPAT_LINUX and COMPAT_NETBSD32
# and COMPAT_50 (or older)
no options EXEC_ELF32 # requires COMPAT_NETBSD32

6
sys/arch/amd64/conf/XEN3_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.183 2020/08/01 08:20:47 maxv Exp $
# $NetBSD: XEN3_DOM0,v 1.184 2020/08/16 10:27:47 jdolecek Exp $
include "arch/amd64/conf/std.xen"
@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
#ident "XEN3_DOM0-$Revision: 1.183 $"
#ident "XEN3_DOM0-$Revision: 1.184 $"
maxusers 32 # estimated number of users
@ -71,8 +71,6 @@ include "conf/compat_netbsd15.config"
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
options COMPAT_LINUX
options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options EXEC_ELF32
# Wedge support

6
sys/arch/amd64/conf/XEN3_DOMU
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOMU,v 1.94 2020/08/01 08:20:47 maxv Exp $
# $NetBSD: XEN3_DOMU,v 1.95 2020/08/16 10:27:47 jdolecek Exp $
include "arch/amd64/conf/std.xen"
@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
#ident "XEN3_DOMU-$Revision: 1.94 $"
#ident "XEN3_DOMU-$Revision: 1.95 $"
maxusers 32 # estimated number of users
@ -61,8 +61,6 @@ include "conf/compat_netbsd15.config"
options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
options COMPAT_LINUX
options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options EXEC_ELF32
# Wedge support

3
sys/arch/evbarm/conf/ARMADILLO9
View File

@ -1,4 +1,4 @@
# $NetBSD: ARMADILLO9,v 1.63 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: ARMADILLO9,v 1.64 2020/08/16 10:27:47 jdolecek Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@ -73,7 +73,6 @@ include "conf/compat_netbsd20.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options
options SYSVMSG # System V-like message queues

3
sys/arch/evbarm/conf/DUOVERO
View File

@ -1,5 +1,5 @@
#
# $NetBSD: DUOVERO,v 1.19 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: DUOVERO,v 1.20 2020/08/16 10:27:47 jdolecek Exp $
#
# DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
#
@ -101,7 +101,6 @@ include "conf/compat_netbsd30.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

3
sys/arch/evbarm/conf/GUMSTIX
View File

@ -1,4 +1,4 @@
# $NetBSD: GUMSTIX,v 1.105 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: GUMSTIX,v 1.106 2020/08/16 10:27:47 jdolecek Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@ -97,7 +97,6 @@ include "conf/compat_netbsd16.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

3
sys/arch/evbarm/conf/HPT5325
View File

@ -1,4 +1,4 @@
# $NetBSD: HPT5325,v 1.48 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: HPT5325,v 1.49 2020/08/16 10:27:47 jdolecek Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@ -93,7 +93,6 @@ include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

4
sys/arch/evbarm/conf/MARVELL_NAS
View File

@ -1,4 +1,4 @@
# $NetBSD: MARVELL_NAS,v 1.39 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: MARVELL_NAS,v 1.40 2020/08/16 10:27:47 jdolecek Exp $
#
# This configuration supports for generically Marvell NAS.
@ -88,8 +88,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd16.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options
options SYSVMSG # System V-like message queues

4
sys/arch/evbarm/conf/MV2120
View File

@ -1,4 +1,4 @@
# $NetBSD: MV2120,v 1.43 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: MV2120,v 1.44 2020/08/16 10:27:47 jdolecek Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@ -96,8 +96,6 @@ options NFS_BOOT_TCP
include "conf/compat_netbsd16.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options
#options SYSVMSG # System V-like message queues

3
sys/arch/evbarm/conf/OPENBLOCKS_A6
View File

@ -1,4 +1,4 @@
# $NetBSD: OPENBLOCKS_A6,v 1.40 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: OPENBLOCKS_A6,v 1.41 2020/08/16 10:27:47 jdolecek Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@ -91,7 +91,6 @@ include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

3
sys/arch/evbarm/conf/OPENBLOCKS_AX3
View File

@ -1,4 +1,4 @@
# $NetBSD: OPENBLOCKS_AX3,v 1.32 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: OPENBLOCKS_AX3,v 1.33 2020/08/16 10:27:47 jdolecek Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@ -95,7 +95,6 @@ include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

4
sys/arch/evbarm/conf/OPENRD
View File

@ -1,4 +1,4 @@
# $NetBSD: OPENRD,v 1.8 2017/11/25 04:22:42 christos Exp $
# $NetBSD: OPENRD,v 1.9 2020/08/16 10:27:47 jdolecek Exp $
#
# This is a working config file for OpenRD(.org) Client. Note that the
# default boot address will not work and the kernel has to load at 8MB
@ -17,8 +17,6 @@ makeoptions LOADADDRESS="0xc0800000"
#options FPU_VFP
no options COMPAT_LINUX
# On-board PCI vga
vga* at pci? dev ? function ?

3
sys/arch/evbarm/conf/PEPPER
View File

@ -1,5 +1,5 @@
#
# $NetBSD: PEPPER,v 1.17 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: PEPPER,v 1.18 2020/08/16 10:27:47 jdolecek Exp $
#
# PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
#
@ -99,7 +99,6 @@ include "conf/compat_netbsd30.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

1
sys/arch/evbarm/conf/POGO
View File

@ -3,7 +3,6 @@
include "arch/evbarm/conf/SHEEVAPLUG"
no options COMPAT_OSSAUDIO
no options COMPAT_LINUX
no options DIAGNOSTIC
no options DEBUG
no uaudio*

3
sys/arch/evbarm/conf/SHEEVAPLUG
View File

@ -1,4 +1,4 @@
# $NetBSD: SHEEVAPLUG,v 1.70 2020/08/01 08:20:48 maxv Exp $
# $NetBSD: SHEEVAPLUG,v 1.71 2020/08/16 10:27:47 jdolecek Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@ -98,7 +98,6 @@ include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options

6
sys/arch/i386/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.1230 2020/08/01 08:20:49 maxv Exp $
# $NetBSD: GENERIC,v 1.1231 2020/08/16 10:27:47 jdolecek 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.1230 $"
#ident "GENERIC-$Revision: 1.1231 $"
maxusers 64 # estimated number of users
@ -145,8 +145,6 @@ include "conf/compat_netbsd09.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances

3
sys/arch/i386/conf/MODULAR
View File

@ -1,4 +1,4 @@
# $NetBSD: MODULAR,v 1.6 2020/03/25 17:06:19 jdolecek Exp $
# $NetBSD: MODULAR,v 1.7 2020/08/16 10:27:47 jdolecek Exp $
#
# MODULAR kernel
# This kernel config prefers loading kernel drivers from file system.
@ -15,7 +15,6 @@ no options NFSSERVER # Network File System server
# compatibility options, built as modules
#
no options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
no options COMPAT_LINUX # binary compatibility with Linux
# build non boot critical file systems as modules
#

4
sys/arch/i386/conf/XEN3PAE_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3PAE_DOM0,v 1.31 2020/08/01 08:20:49 maxv Exp $
# $NetBSD: XEN3PAE_DOM0,v 1.32 2020/08/16 10:27:47 jdolecek Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@ -83,8 +83,6 @@ 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
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances

4
sys/arch/i386/conf/XEN3PAE_DOMU
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3PAE_DOMU,v 1.14 2020/08/01 08:20:49 maxv Exp $
# $NetBSD: XEN3PAE_DOMU,v 1.15 2020/08/16 10:27:47 jdolecek Exp $
include "arch/i386/conf/std.xen"
@ -67,8 +67,6 @@ 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
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances

4
sys/arch/netwinder/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.140 2020/08/01 08:20:50 maxv Exp $
# $NetBSD: GENERIC,v 1.141 2020/08/16 10:27:47 jdolecek Exp $
#
# GENERIC machine description file
#
@ -114,8 +114,6 @@ options NFS_BOOT_DHCP
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
include "conf/compat_netbsd14.config"
options COMPAT_LINUX # binary compatibility with Linux
# Shared memory options
options SYSVMSG # System V-like message queues

7
sys/arch/sgimips/conf/GENERIC32_IP2x
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP2x,v 1.119 2020/08/01 08:20:52 maxv Exp $
# $NetBSD: GENERIC32_IP2x,v 1.120 2020/08/16 10:27:47 jdolecek Exp $
#
# GENERIC32_IP2x machine description file
#
@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC32-IP2x-$Revision: 1.119 $"
#ident "GENERIC32-IP2x-$Revision: 1.120 $"
maxusers 32
@ -77,9 +77,6 @@ options DDB_HISTORY_SIZE=512 # enable history editing in DDB
# Compatibility options
include "conf/compat_netbsd15.config"
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
# File systems
include "conf/filesystems.config"

7
sys/arch/sgimips/conf/GENERIC32_IP3x
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP3x,v 1.131 2020/08/01 08:20:52 maxv Exp $
# $NetBSD: GENERIC32_IP3x,v 1.132 2020/08/16 10:27:47 jdolecek Exp $
#
# GENERIC32_IP3x machine description file
#
@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC32_IP3x-$Revision: 1.131 $"
#ident "GENERIC32_IP3x-$Revision: 1.132 $"
maxusers 32
@ -70,9 +70,6 @@ options DDB_HISTORY_SIZE=512 # enable history editing in DDB
# Compatibility options
include "conf/compat_netbsd15.config"
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
# File systems
include "conf/filesystems.config"

1
sys/arch/sgimips/conf/INSTALL32_IP2x
View File

@ -27,7 +27,6 @@ no options COMPAT_16
no options COMPAT_20
no options COMPAT_30
no options COMPAT_40
no options COMPAT_LINUX
no file-system EXT2FS
no file-system LFS

4
sys/arch/sgimips/conf/std.sgimips64_32
View File

@ -1,4 +1,4 @@
# $NetBSD: std.sgimips64_32,v 1.4 2015/02/18 11:15:19 macallan Exp $
# $NetBSD: std.sgimips64_32,v 1.5 2020/08/16 10:27:47 jdolecek Exp $
# this is for building n32 kernels
no makeoptions MACHINE_ARCH
@ -11,5 +11,3 @@ makeoptions LP64="no"
# for some reason this kicks in for n32 binaries as well, causing problems
# with pkgsrc ( MACHINE_ARCH vs. uname -p mismatch )
#options COMPAT_NETBSD32
no options COMPAT_LINUX

6
sys/arch/shark/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.135 2020/04/18 11:00:42 skrll Exp $
# $NetBSD: GENERIC,v 1.136 2020/08/16 10:27:47 jdolecek Exp $
#
# Generic Shark configuration.
#
@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.135 $"
#ident "GENERIC-$Revision: 1.136 $"
# estimated number of users
maxusers 32
@ -103,8 +103,6 @@ options NFS_BOOT_DHCP # use NetBSD standard DHCP/NFS boot code
include "conf/compat_netbsd12.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_LINUX # Linux compatibility.
# Shared memory options
options SYSVMSG # System V-like message queues