Module Name: src
Committed By: abs
Date: Thu Feb 9 14:09:50 UTC 2023
Modified Files:
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/evbarm/conf: GENERIC GENERIC64 KOBO NETWALKER RPI
src/sys/arch/evbmips/conf: CI20 OCTEON
src/sys/arch/evbppc/conf: TWRP1025
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY XEN3PAE_DOM0 XEN3PAE_DOMU
src/sys/arch/ia64/conf: GENERIC GENERIC.SKI
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC POWERMAC_G5
src/sys/arch/mmeye/conf: MMTA MMTAICE MMTAROMNEW
src/sys/arch/prep/conf: GENERIC INSTALL INSTALL_SMALL
src/sys/arch/riscv/conf: GENERIC
src/sys/arch/rs6000/conf: GENERIC
src/sys/arch/shark/conf: GENERIC OFWGENCFG
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/usermode/conf: GENERIC.common
src/sys/arch/zaurus/conf: GENERIC
Log Message:
Adjust _all_ cinclude of *.local files
- Ensure always at end
- Use tab rather than spaces
- Add consistent comment
"Pull in optional local configuration - always at end"
The only functional change is that a local file which tried to
override an existing setting (eg with "no foo") would have failed
in some cases before, but now will work
To generate a diff of this commit:
cvs rdiff -u -r1.417 -r1.418 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.600 -r1.601 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/KOBO
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/NETWALKER
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbmips/conf/CI20
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/conf/OCTEON
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/TWRP1025
cvs rdiff -u -r1.505 -r1.506 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1245 -r1.1246 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/conf/GENERIC
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/ia64/conf/GENERIC.SKI
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.376 -r1.377 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mmeye/conf/MMTA
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mmeye/conf/MMTAICE
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/mmeye/conf/MMTAROMNEW
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/prep/conf/INSTALL
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/prep/conf/INSTALL_SMALL
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/conf/GENERIC
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/rs6000/conf/GENERIC
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/shark/conf/OFWGENCFG
cvs rdiff -u -r1.238 -r1.239 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.94 -r1.95 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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.417 src/sys/arch/alpha/conf/GENERIC:1.418
--- src/sys/arch/alpha/conf/GENERIC:1.417 Thu Dec 22 11:05:54 2022
+++ src/sys/arch/alpha/conf/GENERIC Thu Feb 9 14:09:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.417 2022/12/22 11:05:54 nat Exp $
+# $NetBSD: GENERIC,v 1.418 2023/02/09 14:09:47 abs 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.417 $"
+ident "GENERIC-$Revision: 1.418 $"
maxusers 32
@@ -741,5 +741,5 @@ include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
cinclude "arch/alpha/conf/GENERIC.local"
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.176 src/sys/arch/amd64/conf/ALL:1.177
--- src/sys/arch/amd64/conf/ALL:1.176 Thu Dec 22 19:09:47 2022
+++ src/sys/arch/amd64/conf/ALL Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.176 2022/12/22 19:09:47 jakllsch Exp $
+# $NetBSD: ALL,v 1.177 2023/02/09 14:09:48 abs Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.176 $"
+#ident "ALL-$Revision: 1.177 $"
maxusers 64 # estimated number of users
@@ -1600,7 +1600,7 @@ flash* at flashbus?
# NAND subsystem
nand* at nandbus?
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
#include "arch/amd64/conf/ALL.local"
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.600 src/sys/arch/amd64/conf/GENERIC:1.601
--- src/sys/arch/amd64/conf/GENERIC:1.600 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/amd64/conf/GENERIC Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.600 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.601 2023/02/09 14:09:48 abs 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.600 $"
+#ident "GENERIC-$Revision: 1.601 $"
maxusers 64 # estimated number of users
@@ -1234,5 +1234,5 @@ options PAX_MPROTECT_DEBUG=1 # PaX mpro
options PAX_ASLR=1 # PaX Address Space Layout Randomization
options PAX_ASLR_DEBUG=1 # PaX ASLR debug
-# Pull in optional local configuration
-cinclude "arch/amd64/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.197 src/sys/arch/amd64/conf/XEN3_DOM0:1.198
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.197 Sun Aug 7 02:52:23 2022
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.197 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: XEN3_DOM0,v 1.198 2023/02/09 14:09:48 abs Exp $
# XEN3_DOM0 machine description file
#
@@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "XEN3_DOM0-$Revision: 1.197 $"
+#ident "XEN3_DOM0-$Revision: 1.198 $"
maxusers 32 # estimated number of users
@@ -1127,10 +1127,6 @@ ld* at sdmmc?
# devices (watchdog timer, etc.)
weasel* at pci?
-# Pull in optional local configuration
-cinclude "arch/amd64/conf/GENERIC.local"
-
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -1229,3 +1225,5 @@ pseudo-device xenevt
pseudo-device xvif
pseudo-device xbdback
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.99 src/sys/arch/amd64/conf/XEN3_DOMU:1.100
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.99 Sun Aug 7 02:52:23 2022
+++ src/sys/arch/amd64/conf/XEN3_DOMU Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.99 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: XEN3_DOMU,v 1.100 2023/02/09 14:09:48 abs 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.99 $"
+#ident "XEN3_DOMU-$Revision: 1.100 $"
maxusers 32 # estimated number of users
@@ -148,9 +148,6 @@ xencons* at hypervisor? # Xen virtual c
#pci* at xpci ?
# you then need to add your PCI devices drivers below.
-cinclude "arch/amd64/conf/GENERIC.local"
-cinclude "arch/amd64/conf/XEN3_DOMU.local"
-
# Pseudo-Devices
#
@@ -215,3 +212,7 @@ pseudo-device ksyms # /dev/ksyms
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
+cinclude "arch/amd64/conf/XEN3_DOMU.local"
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.116 src/sys/arch/evbarm/conf/GENERIC:1.117
--- src/sys/arch/evbarm/conf/GENERIC:1.116 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/evbarm/conf/GENERIC Thu Feb 9 14:09:48 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.116 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.117 2023/02/09 14:09:48 abs Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -627,5 +627,5 @@ bthub* at ubt?
include "dev/bluetooth/bluetoothdevices.config"
-# Pull in optional local configuration
-cinclude "arch/evbarm/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/GENERIC.local"
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.207 src/sys/arch/evbarm/conf/GENERIC64:1.208
--- src/sys/arch/evbarm/conf/GENERIC64:1.207 Sat Dec 24 15:46:50 2022
+++ src/sys/arch/evbarm/conf/GENERIC64 Thu Feb 9 14:09:48 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.207 2022/12/24 15:46:50 nia Exp $
+# $NetBSD: GENERIC64,v 1.208 2023/02/09 14:09:48 abs Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -561,4 +561,5 @@ mpt* at pci? dev ? function ?
scsibus* at scsi?
sd* at scsibus? target ? lun ? # SCSI disk drives
-cinclude "arch/evbarm/conf/GENERIC64.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/GENERIC64.local"
Index: src/sys/arch/evbarm/conf/KOBO
diff -u src/sys/arch/evbarm/conf/KOBO:1.13 src/sys/arch/evbarm/conf/KOBO:1.14
--- src/sys/arch/evbarm/conf/KOBO:1.13 Fri Dec 30 20:37:01 2022
+++ src/sys/arch/evbarm/conf/KOBO Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: KOBO,v 1.13 2022/12/30 20:37:01 andvar Exp $
+# $NetBSD: KOBO,v 1.14 2023/02/09 14:09:48 abs Exp $
#
# KOBO -- http://kobo.com
#
@@ -130,5 +130,5 @@ rgephy* at mii? phy ?
rlphy* at mii? phy ?
ukphy* at mii? phy ?
-# local configuration
-cinclude "arch/evbarm/conf/KOBO.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/KOBO.local"
Index: src/sys/arch/evbarm/conf/NETWALKER
diff -u src/sys/arch/evbarm/conf/NETWALKER:1.42 src/sys/arch/evbarm/conf/NETWALKER:1.43
--- src/sys/arch/evbarm/conf/NETWALKER:1.42 Fri Dec 30 20:37:01 2022
+++ src/sys/arch/evbarm/conf/NETWALKER Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: NETWALKER,v 1.42 2022/12/30 20:37:01 andvar Exp $
+# $NetBSD: NETWALKER,v 1.43 2023/02/09 14:09:48 abs Exp $
#
# NETWALKER -- http://www.sharp.co.jp/netwalker/
#
@@ -170,5 +170,5 @@ options WSDISPLAY_DEFAULTSCREENS=4
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-# local configuration
-cinclude "arch/evbarm/conf/NETWALKER.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/NETWALKER.local"
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.95 src/sys/arch/evbarm/conf/RPI:1.96
--- src/sys/arch/evbarm/conf/RPI:1.95 Mon Jan 17 16:31:24 2022
+++ src/sys/arch/evbarm/conf/RPI Thu Feb 9 14:09:48 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.95 2022/01/17 16:31:24 thorpej Exp $
+# $NetBSD: RPI,v 1.96 2023/02/09 14:09:48 abs Exp $
#
# RPi -- Raspberry Pi
#
@@ -229,9 +229,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
-# local configuration
-cinclude "arch/evbarm/conf/RPI.local"
-
# Bluetooth devices
include "dev/bluetooth/bluetoothdevices.config"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/RPI.local"
Index: src/sys/arch/evbmips/conf/CI20
diff -u src/sys/arch/evbmips/conf/CI20:1.32 src/sys/arch/evbmips/conf/CI20:1.33
--- src/sys/arch/evbmips/conf/CI20:1.32 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbmips/conf/CI20 Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CI20,v 1.32 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: CI20,v 1.33 2023/02/09 14:09:48 abs Exp $
#
# MIPS Creator CI20
#
@@ -7,7 +7,7 @@ include "arch/evbmips/conf/std.ingenic"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CI20-$Revision: 1.32 $"
+#ident "CI20-$Revision: 1.33 $"
maxusers 32
@@ -275,5 +275,5 @@ pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbmips/conf/CI20.local"
-
Index: src/sys/arch/evbmips/conf/OCTEON
diff -u src/sys/arch/evbmips/conf/OCTEON:1.12 src/sys/arch/evbmips/conf/OCTEON:1.13
--- src/sys/arch/evbmips/conf/OCTEON:1.12 Thu Sep 29 10:10:06 2022
+++ src/sys/arch/evbmips/conf/OCTEON Thu Feb 9 14:09:48 2023
@@ -1,11 +1,11 @@
-# $NetBSD: OCTEON,v 1.12 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: OCTEON,v 1.13 2023/02/09 14:09:48 abs Exp $
include "arch/mips/conf/std.octeon"
include "arch/evbmips/conf/files.octeon"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OCTEON-$Revision: 1.12 $"
+#ident "OCTEON-$Revision: 1.13 $"
maxusers 32
@@ -216,4 +216,5 @@ pseudo-device swwdog # software watch
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbmips/conf/OCTEON.local"
Index: src/sys/arch/evbppc/conf/TWRP1025
diff -u src/sys/arch/evbppc/conf/TWRP1025:1.29 src/sys/arch/evbppc/conf/TWRP1025:1.30
--- src/sys/arch/evbppc/conf/TWRP1025:1.29 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/evbppc/conf/TWRP1025 Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: TWRP1025,v 1.29 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: TWRP1025,v 1.30 2023/02/09 14:09:48 abs Exp $
#
# TWRP1025 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "TWRP1025-$Revision: 1.29 $"
+ident "TWRP1025-$Revision: 1.30 $"
maxusers 32
@@ -226,4 +226,5 @@ pseudo-device swwdog # software watch
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbppc/conf/TWRP1025.local"
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.505 src/sys/arch/i386/conf/ALL:1.506
--- src/sys/arch/i386/conf/ALL:1.505 Thu Dec 22 19:09:48 2022
+++ src/sys/arch/i386/conf/ALL Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.505 2022/12/22 19:09:48 jakllsch Exp $
+# $NetBSD: ALL,v 1.506 2023/02/09 14:09:48 abs Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.505 $"
+#ident "ALL-$Revision: 1.506 $"
maxusers 64 # estimated number of users
@@ -1704,7 +1704,7 @@ flash* at flashbus?
# NAND subsystem
nand* at nandbus?
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
#include "arch/i386/conf/ALL.local"
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1245 src/sys/arch/i386/conf/GENERIC:1.1246
--- src/sys/arch/i386/conf/GENERIC:1.1245 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/i386/conf/GENERIC Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1245 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.1246 2023/02/09 14:09:48 abs 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.1245 $"
+#ident "GENERIC-$Revision: 1.1246 $"
maxusers 64 # estimated number of users
@@ -1516,5 +1516,5 @@ options PAX_MPROTECT=1 # PaX mprotect(
options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
-cinclude "arch/i386/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.170 src/sys/arch/i386/conf/GENERIC_TINY:1.171
--- src/sys/arch/i386/conf/GENERIC_TINY:1.170 Thu Jan 21 06:51:55 2021
+++ src/sys/arch/i386/conf/GENERIC_TINY Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.170 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: GENERIC_TINY,v 1.171 2023/02/09 14:09:48 abs Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -492,10 +492,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-# Pull in optional local configuration
-cinclude "arch/i386/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -524,3 +520,6 @@ pseudo-device clockctl # user control o
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.56 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.57
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.56 Thu Jan 21 06:51:55 2021
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.56 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.57 2023/02/09 14:09:48 abs Exp $
#
# INSTALL - Installation kernel.
#
@@ -713,9 +713,6 @@ viomb* at virtio? # Virtio memory ball
ld* at virtio? # Virtio disk device
vioif* at virtio? # Virtio network device
-# Pull in optional local configuration
-cinclude "arch/i386/conf/INSTALL.local"
-
# Pseudo-Devices
@@ -749,3 +746,5 @@ options NO_DEV_PTM
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/INSTALL.local"
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.163 src/sys/arch/i386/conf/INSTALL_TINY:1.164
--- src/sys/arch/i386/conf/INSTALL_TINY:1.163 Thu Jan 21 06:51:55 2021
+++ src/sys/arch/i386/conf/INSTALL_TINY Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.163 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: INSTALL_TINY,v 1.164 2023/02/09 14:09:48 abs Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -461,9 +461,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-# Pull in optional local configuration
-cinclude "arch/i386/conf/INSTALL.local"
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -483,3 +480,6 @@ pseudo-device loop # network loopback
pseudo-device pty # pseudo-terminals
options NO_DEV_PTM
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/INSTALL.local"
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.36 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.37
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.36 Sun Aug 7 02:52:26 2022
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.36 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.37 2023/02/09 14:09:48 abs Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -769,9 +769,6 @@ btsco* at bthub?
hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
-cinclude "arch/i386/conf/GENERIC.local"
-cinclude "arch/i386/conf/XEN3_DOM0.local"
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -884,3 +881,7 @@ acpiecdt* at acpi? # ACPI Embedded Cont
acpilid* at acpi? # ACPI Lid Switch
aibs* at acpi? # ASUSTeK AI Booster hardware monitor
hpqlb* at acpi? # HP Quick Launch Buttons
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOM0.local"
Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.18 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.19
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.18 Sun Aug 7 02:52:26 2022
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.18 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.19 2023/02/09 14:09:48 abs Exp $
include "arch/i386/conf/std.xen"
@@ -164,9 +164,6 @@ xennet* at xenbus? # Xen virtual netwo
xbd* at xenbus? # Xen virtual block device
balloon* at xenbus? # Xen balloon device
-cinclude "arch/i386/conf/GENERIC.local"
-cinclude "arch/i386/conf/XEN3_DOMU.local"
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -232,3 +229,7 @@ options PAX_ASLR=0 # PaX Address Space
#xpci* at xenbus ? #Xen3 PCI front end driver
#pci* at xpci ?
# you then need to add your PCI devices drivers below.
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOMU.local"
Index: src/sys/arch/ia64/conf/GENERIC
diff -u src/sys/arch/ia64/conf/GENERIC:1.13 src/sys/arch/ia64/conf/GENERIC:1.14
--- src/sys/arch/ia64/conf/GENERIC:1.13 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/ia64/conf/GENERIC Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.13 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.14 2023/02/09 14:09:48 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.13 $"
+#ident "GENERIC-$Revision: 1.14 $"
maxusers 32 # estimated number of users
@@ -142,5 +142,5 @@ pseudo-device loop # network loopback
#pseudo-device pty # pseudo-terminals
pseudo-device swwdog # software watchdog timer -- swwdog(4)
-# Pull in optional local configuration
-cinclude "arch/ia64/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/ia64/conf/GENERIC.local"
Index: src/sys/arch/ia64/conf/GENERIC.SKI
diff -u src/sys/arch/ia64/conf/GENERIC.SKI:1.20 src/sys/arch/ia64/conf/GENERIC.SKI:1.21
--- src/sys/arch/ia64/conf/GENERIC.SKI:1.20 Sun Aug 7 02:52:26 2022
+++ src/sys/arch/ia64/conf/GENERIC.SKI Thu Feb 9 14:09:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.SKI,v 1.20 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: GENERIC.SKI,v 1.21 2023/02/09 14:09:48 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.20 $"
+#ident "GENERIC-$Revision: 1.21 $"
maxusers 32 # estimated number of users
@@ -114,10 +114,6 @@ cpu* at mainbus?
acpi0 at mainbus?
-
-# Pull in optional local configuration
-cinclude "arch/ia64/conf/GENERIC.local"
-
# Console Devices
#ssccons* at mainbus0 # Ski console interface driver
#wsdisplay* at ssccons0 console ?
@@ -169,3 +165,6 @@ pseudo-device loop # network loopback
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
+
+# Pull in optional local configuration - always at end
+cinclude "arch/ia64/conf/GENERIC.local"
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.75 src/sys/arch/landisk/conf/GENERIC:1.76
--- src/sys/arch/landisk/conf/GENERIC:1.75 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/landisk/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.75 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.76 2023/02/09 14:09:49 abs 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.75 $"
+#ident "GENERIC-$Revision: 1.76 $"
maxusers 16 # estimated number of users
@@ -461,5 +461,5 @@ options PAX_MPROTECT=1 # PaX mprotect(
options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
-cinclude "arch/landisk/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/landisk/conf/GENERIC.local"
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.376 src/sys/arch/macppc/conf/GENERIC:1.377
--- src/sys/arch/macppc/conf/GENERIC:1.376 Thu Jan 26 00:15:47 2023
+++ src/sys/arch/macppc/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.376 2023/01/26 00:15:47 macallan Exp $
+# $NetBSD: GENERIC,v 1.377 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.376 $"
+#ident "GENERIC-$Revision: 1.377 $"
maxusers 32
@@ -550,5 +550,5 @@ include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
-# Pull in optional local configuration
-cinclude "arch/macppc/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/macppc/conf/GENERIC.local"
Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.55 src/sys/arch/macppc/conf/POWERMAC_G5:1.56
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.55 Sun Aug 7 02:52:27 2022
+++ src/sys/arch/macppc/conf/POWERMAC_G5 Thu Feb 9 14:09:49 2023
@@ -251,4 +251,5 @@ pseudo-device bpfilter # packet filter
#options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
#options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+# Pull in optional local configuration - always at end
cinclude "arch/macppc/conf/POWERMAC_G5.local"
Index: src/sys/arch/mmeye/conf/MMTA
diff -u src/sys/arch/mmeye/conf/MMTA:1.54 src/sys/arch/mmeye/conf/MMTA:1.55
--- src/sys/arch/mmeye/conf/MMTA:1.54 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mmeye/conf/MMTA Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: MMTA,v 1.54 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMTA,v 1.55 2023/02/09 14:09:49 abs Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -188,11 +188,6 @@ sqphy* at mii? phy ? # Seeq 80220/8022
#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pull in optional local configuration
-cinclude "arch/mmeye/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -215,3 +210,6 @@ pseudo-device clockctl # user control o
# rnd is EXPERIMENTAL at this point.
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
Index: src/sys/arch/mmeye/conf/MMTAICE
diff -u src/sys/arch/mmeye/conf/MMTAICE:1.58 src/sys/arch/mmeye/conf/MMTAICE:1.59
--- src/sys/arch/mmeye/conf/MMTAICE:1.58 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mmeye/conf/MMTAICE Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAICE,v 1.58 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMTAICE,v 1.59 2023/02/09 14:09:49 abs Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -207,11 +207,6 @@ sqphy* at mii? phy ? # Seeq 80220/8022
#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pull in optional local configuration
-cinclude "arch/mmeye/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -234,3 +229,6 @@ pseudo-device clockctl # user control o
# rnd is EXPERIMENTAL at this point.
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
Index: src/sys/arch/mmeye/conf/MMTAROMNEW
diff -u src/sys/arch/mmeye/conf/MMTAROMNEW:1.55 src/sys/arch/mmeye/conf/MMTAROMNEW:1.56
--- src/sys/arch/mmeye/conf/MMTAROMNEW:1.55 Sun Jan 19 01:25:06 2020
+++ src/sys/arch/mmeye/conf/MMTAROMNEW Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAROMNEW,v 1.55 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMTAROMNEW,v 1.56 2023/02/09 14:09:49 abs Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -192,11 +192,6 @@ sqphy* at mii? phy ? # Seeq 80220/8022
#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pull in optional local configuration
-cinclude "arch/mmeye/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -219,3 +214,6 @@ pseudo-device clockctl # user control o
# rnd is EXPERIMENTAL at this point.
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.199 src/sys/arch/prep/conf/GENERIC:1.200
--- src/sys/arch/prep/conf/GENERIC:1.199 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/prep/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.200 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.199 $"
+#ident "GENERIC-$Revision: 1.200 $"
maxusers 32
@@ -562,5 +562,5 @@ pseudo-device wsfont
include "dev/veriexec.config"
-# Pull in optional local configuration
-cinclude "arch/prep/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/prep/conf/GENERIC.local"
Index: src/sys/arch/prep/conf/INSTALL
diff -u src/sys/arch/prep/conf/INSTALL:1.65 src/sys/arch/prep/conf/INSTALL:1.66
--- src/sys/arch/prep/conf/INSTALL:1.65 Sun Dec 12 22:20:52 2021
+++ src/sys/arch/prep/conf/INSTALL Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2021/12/12 22:20:52 andvar Exp $
+# $NetBSD: INSTALL,v 1.66 2023/02/09 14:09:49 abs Exp $
#
# INSTALL -- Installation kernel
#
@@ -253,7 +253,7 @@ tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
include "arch/prep/conf/INSTALL.local"
# Pseudo-Devices
Index: src/sys/arch/prep/conf/INSTALL_SMALL
diff -u src/sys/arch/prep/conf/INSTALL_SMALL:1.20 src/sys/arch/prep/conf/INSTALL_SMALL:1.21
--- src/sys/arch/prep/conf/INSTALL_SMALL:1.20 Sun Dec 12 22:20:52 2021
+++ src/sys/arch/prep/conf/INSTALL_SMALL Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_SMALL,v 1.20 2021/12/12 22:20:52 andvar Exp $
+# $NetBSD: INSTALL_SMALL,v 1.21 2023/02/09 14:09:49 abs Exp $
#
# INSTALL -- Installation kernel
#
@@ -244,7 +244,7 @@ nsphy* at mii? phy ? # NS83840 PHYs
#sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
include "arch/prep/conf/INSTALL.local"
# Pseudo-Devices
Index: src/sys/arch/riscv/conf/GENERIC
diff -u src/sys/arch/riscv/conf/GENERIC:1.22 src/sys/arch/riscv/conf/GENERIC:1.23
--- src/sys/arch/riscv/conf/GENERIC:1.22 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/riscv/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.22 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.23 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/riscv/sifive/files.sifive"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.22 $"
+#ident "GENERIC-$Revision: 1.23 $"
maxusers 64 # estimated number of users
@@ -188,5 +188,5 @@ pseudo-device drvctl
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
cinclude "arch/riscv/conf/GENERIC.local"
Index: src/sys/arch/rs6000/conf/GENERIC
diff -u src/sys/arch/rs6000/conf/GENERIC:1.48 src/sys/arch/rs6000/conf/GENERIC:1.49
--- src/sys/arch/rs6000/conf/GENERIC:1.48 Thu Feb 9 13:16:04 2023
+++ src/sys/arch/rs6000/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.48 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.49 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed con
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.48 $"
+#ident "GENERIC-$Revision: 1.49 $"
maxusers 32
@@ -252,5 +252,5 @@ pseudo-device wsfont
include "dev/veriexec.config"
-# Pull in optional local configuration
-cinclude "arch/rs6000/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/rs6000/conf/GENERIC.local"
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.143 src/sys/arch/shark/conf/GENERIC:1.144
--- src/sys/arch/shark/conf/GENERIC:1.143 Thu Feb 9 13:16:05 2023
+++ src/sys/arch/shark/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.143 2023/02/09 13:16:05 abs Exp $
+# $NetBSD: GENERIC,v 1.144 2023/02/09 14:09:49 abs 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.143 $"
+#ident "GENERIC-$Revision: 1.144 $"
# estimated number of users
maxusers 32
@@ -310,5 +310,5 @@ include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
-cinclude "arch/shark/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/shark/conf/GENERIC.local"
Index: src/sys/arch/shark/conf/OFWGENCFG
diff -u src/sys/arch/shark/conf/OFWGENCFG:1.49 src/sys/arch/shark/conf/OFWGENCFG:1.50
--- src/sys/arch/shark/conf/OFWGENCFG:1.49 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/shark/conf/OFWGENCFG Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: OFWGENCFG,v 1.49 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: OFWGENCFG,v 1.50 2023/02/09 14:09:49 abs Exp $
#
# OFWGENCFG: 'generic' configuration for Open Firmware boards.
#
@@ -114,9 +114,6 @@ ofcons* at ofbus?
ofrtc* at ofbus?
ofrom* at ofbus?
-# Pull in optional local configuration
-cinclude "arch/shark/conf/GENERIC.local"
-
pseudo-device loop # network loopback
pseudo-device bpfilter # packet filter
#pseudo-device sl # CSLIP
@@ -132,3 +129,6 @@ pseudo-device vnd # disk-like interfac
#pseudo-device md # Ramdisk driver
pseudo-device clockctl # user control of clock subsystem
pseudo-device openfirm # /dev/openfirm
+
+# Pull in optional local configuration - always at end
+cinclude "arch/shark/conf/GENERIC.local"
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.238 src/sys/arch/sparc64/conf/GENERIC:1.239
--- src/sys/arch/sparc64/conf/GENERIC:1.238 Thu Feb 9 13:16:05 2023
+++ src/sys/arch/sparc64/conf/GENERIC Thu Feb 9 14:09:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.238 2023/02/09 13:16:05 abs Exp $
+# $NetBSD: GENERIC,v 1.239 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.238 $"
+#ident "GENERIC-$Revision: 1.239 $"
maxusers 64
@@ -867,5 +867,5 @@ options PAX_SEGVGUARD=0 # PaX Segmenta
# options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
-cinclude "arch/sparc64/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/sparc64/conf/GENERIC.local"
Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.29 src/sys/arch/usermode/conf/GENERIC.common:1.30
--- src/sys/arch/usermode/conf/GENERIC.common:1.29 Wed Jan 20 13:22:08 2021
+++ src/sys/arch/usermode/conf/GENERIC.common Thu Feb 9 14:09:50 2023
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC.common,v 1.29 2021/01/20 13:22:08 nia Exp $
+# $NetBSD: GENERIC.common,v 1.30 2023/02/09 14:09:50 abs Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32
makeoptions DEBUG="-O1 -g3"
@@ -94,5 +94,5 @@ pseudo-device drvctl
pseudo-device ksyms
pseudo-device wsmux
-# Pull in optional local configuration
-cinclude "arch/usermode/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/usermode/conf/GENERIC.local"
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.94 src/sys/arch/zaurus/conf/GENERIC:1.95
--- src/sys/arch/zaurus/conf/GENERIC:1.94 Thu Feb 9 13:16:05 2023
+++ src/sys/arch/zaurus/conf/GENERIC Thu Feb 9 14:09:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.94 2023/02/09 13:16:05 abs Exp $
+# $NetBSD: GENERIC,v 1.95 2023/02/09 14:09:50 abs Exp $
#
# GENERIC machine description file
#
@@ -391,5 +391,5 @@ pseudo-device swwdog # software watch
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-# Pull in optional local configuration
-cinclude "arch/zaurus/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/zaurus/conf/GENERIC.local"
