Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/pgoyette-compat]: src/sys/arch Add a NOCOMPAT kernel definition to serve...



details:   https://anonhg.NetBSD.org/src/rev/18cf739c65bf
branches:  pgoyette-compat
changeset: 320946:18cf739c65bf
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Mar 06 04:45:04 2018 +0000

description:
Add a NOCOMPAT kernel definition to serve as a baseline for getting
the incremental COMPAT_xx options working.

While here, add some additional "requires COMPAT_xxx" to some of the
options in GENERIC

diffstat:

 sys/arch/amd64/conf/GENERIC        |     9 +-
 sys/arch/amd64/conf/NOCOMPAT       |  1366 ++++++++++++++++++++++++++++++++++++
 sys/arch/emips/include/disklabel.h |     2 +-
 sys/arch/x68k/include/cdefs.h      |     2 +-
 sys/arch/x68k/include/cpufunc.h    |     2 +-
 sys/arch/x68k/include/ieeefp.h     |     2 +-
 sys/arch/x68k/include/profile.h    |     2 +-
 sys/arch/x68k/include/setjmp.h     |     2 +-
 8 files changed, 1377 insertions(+), 10 deletions(-)

diffs (truncated from 1452 to 300 lines):

diff -r 17e643d11373 -r 18cf739c65bf sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Mar 05 23:00:55 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Mar 06 04:45:04 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.485 2018/02/26 05:52:50 maxv Exp $
+# $NetBSD: GENERIC,v 1.485.2.1 2018/03/06 04:45:04 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.485 $"
+#ident         "GENERIC-$Revision: 1.485.2.1 $"
 
 maxusers       64              # estimated number of users
 
@@ -131,8 +131,9 @@
 options        COMPAT_OSSAUDIO
 options        COMPAT_NETBSD32
 options        COMPAT_LINUX
-options        COMPAT_LINUX32  # req. COMPAT_LINUX and COMPAT_NETBSD32
-options        EXEC_ELF32
+options        COMPAT_LINUX32  # requires COMPAT_LINUX and COMPAT_NETBSD32
+                               # and COMPAT_50 (or older)
+options        EXEC_ELF32      # requires COMPAT_NETBSD32
 
 # Wedge support
 options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
diff -r 17e643d11373 -r 18cf739c65bf sys/arch/amd64/conf/NOCOMPAT
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/conf/NOCOMPAT      Tue Mar 06 04:45:04 2018 +0000
@@ -0,0 +1,1366 @@
+# $NetBSD: NOCOMPAT,v 1.1.2.1 2018/03/06 04:45:04 pgoyette Exp $
+#
+# GENERIC machine description file
+#
+# This machine description file is used to generate the default NetBSD
+# kernel.  The generic kernel does not include all options, subsystems
+# and device drivers, but should be useful for most applications.
+#
+# The machine description file can be customised for your specific
+# machine to reduce the kernel size and improve its performance.
+#
+# For further information on compiling NetBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page.  For further information about kernel options
+# for this architecture, see the options(4) man page.  For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
+
+include        "arch/amd64/conf/std.amd64"
+
+options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
+
+#ident         "GENERIC-$Revision: 1.1.2.1 $"
+
+maxusers       64              # estimated number of users
+
+# delay between "rebooting ..." message and hardware reset, in milliseconds
+#options       CPURESET_DELAY=2000
+
+# This option allows you to force a serial console at the specified
+# I/O address.   see console(4) for details.
+#options       CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
+#      you don't want the option below ON iff you are using the
+#      serial console option of the new boot strap code.
+#options       CONS_OVERRIDE   # Always use above! independent of boot info
+
+# The following options override the memory sizes passed in from the boot
+# block.  Use them *only* if the boot block is unable to determine the correct
+# values.  Note that the BIOS may *correctly* report less than 640k of base
+# memory if the extended BIOS data area is located at the top of base memory
+# (as is the case on most recent systems).
+#options       REALBASEMEM=639         # size of base memory (in KB)
+#options       REALEXTMEM=15360        # size of extended memory (in KB)
+
+# The following options limit the overall size of physical memory
+# and/or the maximum address used by the system.
+# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
+# and can deal with holes in the memory layout.
+#options       PHYSMEM_MAX_SIZE=64     # max size of physical memory (in MB)
+#options       PHYSMEM_MAX_ADDR=2048   # don't use memory above this (in MB)
+
+# Standard system options
+
+options        INSECURE        # disable kernel security levels - X needs this
+
+options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
+options        NTP             # NTP phase/frequency locked loop
+
+options        KTRACE          # system call tracing via ktrace(1)
+
+options        CPU_UCODE       # cpu ucode loading support
+
+# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
+options        SYSVMSG         # System V-like message queues
+options        SYSVSEM         # System V-like semaphores
+options        SYSVSHM         # System V-like memory sharing
+
+options        MODULAR         # new style module(7) framework
+options        MODULAR_DEFAULT_AUTOLOAD
+options        USERCONF        # userconf(4) support
+#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
+
+# CPU-related options
+#options       USER_LDT        # user-settable LDT; used by WINE
+options        SVS             # Separate Virtual Space
+
+# CPU features
+acpicpu*       at cpu?         # ACPI CPU (including frequency scaling)
+coretemp*      at cpu?         # Intel on-die thermal sensor
+est0           at cpu0         # Intel Enhanced SpeedStep (non-ACPI)
+#odcm0         at cpu0         # On-demand clock modulation
+powernow0      at cpu0         # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
+vmt0           at cpu0         # VMware Tools
+
+options        PMC             # performance-monitoring counters support
+
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options       BUFQ_READPRIO
+options        BUFQ_PRIOCSCAN
+
+# Diagnostic/debugging support options
+options        DIAGNOSTIC      # inexpensive kernel consistency checks
+                               # XXX to be commented out on release branch
+#options       DEBUG           # expensive debugging checks/support
+#options       LOCKDEBUG       # expensive locking checks/support
+
+#
+# Because gcc omits the frame pointer for any -O level, the line below
+# is needed to make backtraces in DDB work.
+#
+makeoptions    COPTS="-O2 -fno-omit-frame-pointer"
+options        DDB             # in-kernel debugger
+#options       DDB_COMMANDONENTER="bt" # execute command when ddb is entered
+#options       DDB_ONPANIC=1   # see also sysctl(7): `ddb.onpanic'
+options        DDB_HISTORY_SIZE=512    # enable history editing in DDB
+#options       KGDB            # remote debugger
+#options       KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
+makeoptions    DEBUG="-g"      # compile full symbol table for CTF
+#options       SYSCALL_STATS   # per syscall counts
+#options       SYSCALL_TIMES   # per syscall times
+#options       SYSCALL_TIMES_HASCOUNTER        # use 'broken' rdtsc (soekris)
+options        KDTRACE_HOOKS   # kernel DTrace hooks
+
+# Compatibility options
+# x86_64 never shipped with a.out binaries; the two options below are
+# only relevant to 32-bit i386 binaries
+#options       EXEC_AOUT       # required by binaries from before 1.5
+#options       COMPAT_NOMID    # NetBSD 0.8, 386BSD, and BSDI
+
+# NetBSD backward compatibility. Support goes from COMPAT_15 up until
+# the latest release. Note that really old compat (< COMPAT_16) is only
+# useful for 32-bit i386 binaries.
+#include       "conf/compat_netbsd15.config"
+
+#options       COMPAT_386BSD_MBRPART # recognize old partition ID
+
+options        COMPAT_OSSAUDIO
+#options       COMPAT_NETBSD32
+#options       COMPAT_LINUX
+#options       COMPAT_LINUX32  # requires COMPAT_LINUX and COMPAT_NETBSD32
+                               # and COMPAT_50 (or older)
+#options       EXEC_ELF32      # requires COMPAT_NETBSD32
+
+# Wedge support
+options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
+options        DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
+#options       DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
+#options       DKWEDGE_METHOD_MBR      # Support MBR partitions as wedges
+options        DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
+#options       DKWEDGE_METHOD_RDB      # Support RDB partitions as wedges
+
+# File systems
+file-system    FFS             # UFS
+file-system    MFS             # memory file system
+file-system    NFS             # Network File System client
+file-system    TMPFS           # Efficient memory file-system
+file-system    EXT2FS          # second extended file system (linux)
+file-system    LFS             # log-structured 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   AUTOFS          # experimental - Automounter Filesystem
+
+# File system options
+# ffs
+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
+# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
+# It is not recommended for general use.
+#options       UFS_DIRHASH     # UFS Large Directory Hashing - Experimental
+#options       FFS_NO_SNAPSHOT # No FFS snapshot support
+options        UFS_EXTATTR     # Extended attribute support for UFS1
+# ext2fs
+#options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+                               # immutable) behave as system flags.
+# other
+#options       DISKLABEL_EI    # disklabel Endian Independent support
+options        NFSSERVER       # Network File System server
+
+# Networking options
+#options       GATEWAY         # packet forwarding
+options        INET            # IP + ICMP + TCP + UDP
+options        INET6           # IPV6
+options        IPSEC           # IP security
+#options       IPSEC_DEBUG     # debug for IP security
+#options       MPLS            # MultiProtocol Label Switching (needs mpls)
+#options       MROUTING        # IP multicast routing
+#options       PIM             # Protocol Independent Multicast
+options        NETATALK        # AppleTalk networking protocols
+#options       CAN             # Controller Area Network protocol
+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        IPFILTER_LOG    # ipmon(8) log support
+options        IPFILTER_LOOKUP # ippool(8) support
+options        IPFILTER_COMPAT # Compat for IP-Filter
+#options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
+#options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
+#options       TCP_SIGNATURE   # Enable RFC-2385 TCP md5 signatures
+
+#options       ALTQ            # Manipulate network interfaces' output queues
+#options       ALTQ_BLUE       # Stochastic Fair Blue
+#options       ALTQ_CBQ        # Class-Based Queueing
+#options       ALTQ_CDNR       # Diffserv Traffic Conditioner
+#options       ALTQ_FIFOQ      # First-In First-Out Queue
+#options       ALTQ_FLOWVALVE  # RED/flow-valve (red-penalty-box)
+#options       ALTQ_HFSC       # Hierarchical Fair Service Curve
+#options       ALTQ_LOCALQ     # Local queueing discipline
+#options       ALTQ_PRIQ       # Priority Queueing
+#options       ALTQ_RED        # Random Early Detection
+#options       ALTQ_RIO        # RED with IN/OUT
+#options       ALTQ_WFQ        # Weighted Fair Queueing
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+#options       ACPIVERBOSE     # verbose ACPI configuration messages
+#options       MIIVERBOSE      # verbose PHY autoconfig messages
+#options       PCIVERBOSE      # verbose PCI device autoconfig messages
+#options       PCI_CONFIG_DUMP # verbosely dump PCI config space
+#options       PCMCIAVERBOSE   # verbose PCMCIA configuration messages
+options        SCSIVERBOSE     # human readable SCSI error messages
+#options       USBVERBOSE      # verbose USB device autoconfig messages
+#options       HDAUDIOVERBOSE  # verbose HDAUDIO driver messages
+
+options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
+
+#
+# wscons options
+#
+# builtin terminal emulations
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+# different kernel output - see dev/wscons/wsdisplayvar.h
+options        WS_KERNEL_FG=WSCOL_GREEN
+#options       WS_KERNEL_BG=WSCOL_BLACK
+# compatibility to other console drivers
+options        WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
+options        WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
+options        WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
+options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
+# don't attach pckbd as the console if no PS/2 keyboard is found
+options        PCKBD_CNATTACH_MAY_FAIL
+# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+# allocate a number of virtual screens at autoconfiguration time
+#options       WSDISPLAY_DEFAULTSCREENS=4
+# use a large software cursor that doesn't blink
+options        PCDISPLAY_SOFTCURSOR
+# modify the screen type of the console; defaults to "80x25"
+#options       VGA_CONSOLE_SCREENTYPE="\"80x24\""
+# work around a hardware bug that loaded fonts don't work; found on ATI cards
+#options       VGA_CONSOLE_ATI_BROKEN_FONTSEL
+# console scrolling support.
+options        WSDISPLAY_SCROLLSUPPORT
+# enable VGA raster mode capable of displaying multilingual text on console
+#options       VGA_RASTERCONSOLE



Home | Main Index | Thread Index | Old Index