Module Name: src
Committed By: abs
Date: Thu Feb 9 13:16:05 UTC 2023
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/evbarm/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
src/sys/arch/ia64/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/prep/conf: GENERIC
src/sys/arch/riscv/conf: GENERIC
src/sys/arch/rs6000/conf: GENERIC
src/sys/arch/shark/conf: GENERIC
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/zaurus/conf: GENERIC
Log Message:
Ensure GENERIC.local is always at the end of GENERIC
Where a GENERIC config had an existing inclusion of GENERIC.local,
ensure it is always at the end of the file, with a consistent
comment:
# Pull in optional local configuration
cinclude "arch/landisk/conf/GENERIC.local"
This allows GENERIC.local to correctly override all options
(This pass does not affect any GENERIC which did not already have
an include of GENERIC.local)
To generate a diff of this commit:
cvs rdiff -u -r1.599 -r1.600 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/evbarm/conf/GENERIC
cvs rdiff -u -r1.1244 -r1.1245 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ia64/conf/GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/riscv/conf/GENERIC
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/rs6000/conf/GENERIC
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.93 -r1.94 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.599 src/sys/arch/amd64/conf/GENERIC:1.600
--- src/sys/arch/amd64/conf/GENERIC:1.599 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/amd64/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.599 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.600 2023/02/09 13:16:04 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.599 $"
+#ident "GENERIC-$Revision: 1.600 $"
maxusers 64 # estimated number of users
@@ -1136,10 +1136,6 @@ hvshutdown* at vmbus? # Hyper-V Guest S
hvtimesync* at vmbus? # Hyper-V Time Synchronization Service
#hvkvp* at vmbus? # Hyper-V Data Exchange Service
-# Pull in optional local configuration
-cinclude "arch/amd64/conf/GENERIC.local"
-
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -1237,3 +1233,6 @@ options PAX_MPROTECT=1 # PaX mprotect(
options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
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"
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.115 src/sys/arch/evbarm/conf/GENERIC:1.116
--- src/sys/arch/evbarm/conf/GENERIC:1.115 Fri Nov 11 20:31:30 2022
+++ src/sys/arch/evbarm/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.115 2022/11/11 20:31:30 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.116 2023/02/09 13:16:04 abs Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -627,4 +627,5 @@ bthub* at ubt?
include "dev/bluetooth/bluetoothdevices.config"
+# Pull in optional local configuration
cinclude "arch/evbarm/conf/GENERIC.local"
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1244 src/sys/arch/i386/conf/GENERIC:1.1245
--- src/sys/arch/i386/conf/GENERIC:1.1244 Thu Dec 22 19:07:16 2022
+++ src/sys/arch/i386/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1244 2022/12/22 19:07:16 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.1245 2023/02/09 13:16:04 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.1244 $"
+#ident "GENERIC-$Revision: 1.1245 $"
maxusers 64 # estimated number of users
@@ -1420,11 +1420,6 @@ hvshutdown* at vmbus? # Hyper-V Guest S
hvtimesync* at vmbus? # Hyper-V Time Synchronization Service
#hvkvp* at vmbus? # Hyper-V Data Exchange Service
-
-# Pull in optional local configuration
-cinclude "arch/i386/conf/GENERIC.local"
-
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -1520,3 +1515,6 @@ options PAX_SEGVGUARD=0 # PaX Segmenta
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
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"
Index: src/sys/arch/ia64/conf/GENERIC
diff -u src/sys/arch/ia64/conf/GENERIC:1.12 src/sys/arch/ia64/conf/GENERIC:1.13
--- src/sys/arch/ia64/conf/GENERIC:1.12 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/ia64/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.12 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.13 2023/02/09 13:16:04 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.12 $"
+#ident "GENERIC-$Revision: 1.13 $"
maxusers 32 # estimated number of users
@@ -124,9 +124,6 @@ com* at acpi? # Serial communications
#puc* at pci? dev ? function ?
#com* at puc? port ?
-# Pull in optional local configuration
-cinclude "arch/ia64/conf/GENERIC.local"
-
# Pseudo-Devices
# Enable the hooks used for initializing the root memory-disk.
@@ -144,3 +141,6 @@ pseudo-device loop # network loopback
# miscellaneous pseudo-devices
#pseudo-device pty # pseudo-terminals
pseudo-device swwdog # software watchdog timer -- swwdog(4)
+
+# Pull in optional local configuration
+cinclude "arch/ia64/conf/GENERIC.local"
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.74 src/sys/arch/landisk/conf/GENERIC:1.75
--- src/sys/arch/landisk/conf/GENERIC:1.74 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/landisk/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.74 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.75 2023/02/09 13:16:04 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.74 $"
+#ident "GENERIC-$Revision: 1.75 $"
maxusers 16 # estimated number of users
@@ -389,10 +389,6 @@ pwrsw0 at obio?
# Reset button, USL-5P misc button
btn0 at obio?
-# Pull in optional local configuration
-cinclude "arch/landisk/conf/GENERIC.local"
-
-
# Pseudo-Devices
#
@@ -464,3 +460,6 @@ options PAX_SEGVGUARD=0 # PaX Segmenta
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
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"
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.198 src/sys/arch/prep/conf/GENERIC:1.199
--- src/sys/arch/prep/conf/GENERIC:1.198 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/prep/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.198 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.199 2023/02/09 13:16:04 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.198 $"
+#ident "GENERIC-$Revision: 1.199 $"
maxusers 32
@@ -498,9 +498,6 @@ ukphy* at mii? phy ? # generic unknown
# 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/prep/conf/GENERIC.local"
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -564,3 +561,6 @@ pseudo-device wsmux # mouse & keyboard
pseudo-device wsfont
include "dev/veriexec.config"
+
+# Pull in optional local configuration
+cinclude "arch/prep/conf/GENERIC.local"
Index: src/sys/arch/riscv/conf/GENERIC
diff -u src/sys/arch/riscv/conf/GENERIC:1.21 src/sys/arch/riscv/conf/GENERIC:1.22
--- src/sys/arch/riscv/conf/GENERIC:1.21 Fri Nov 25 12:35:44 2022
+++ src/sys/arch/riscv/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21 2022/11/25 12:35:44 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.22 2023/02/09 13:16:04 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.21 $"
+#ident "GENERIC-$Revision: 1.22 $"
maxusers 64 # estimated number of users
@@ -188,4 +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
cinclude "arch/riscv/conf/GENERIC.local"
Index: src/sys/arch/rs6000/conf/GENERIC
diff -u src/sys/arch/rs6000/conf/GENERIC:1.47 src/sys/arch/rs6000/conf/GENERIC:1.48
--- src/sys/arch/rs6000/conf/GENERIC:1.47 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/rs6000/conf/GENERIC Thu Feb 9 13:16:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.47 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.48 2023/02/09 13:16:04 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.47 $"
+#ident "GENERIC-$Revision: 1.48 $"
maxusers 32
@@ -188,9 +188,6 @@ com* at ioplanar?
#ss* at scsibus? target ? lun ? # SCSI scanners
#uk* at scsibus? target ? lun ? # SCSI unknown
-# Pull in optional local configuration
-cinclude "arch/rs6000/conf/GENERIC.local"
-
# Pseudo-Devices
# Not yet ready -- prep lacks generic soft interrupts
@@ -254,3 +251,6 @@ pseudo-device wsmux # mouse & keyboard
pseudo-device wsfont
include "dev/veriexec.config"
+
+# Pull in optional local configuration
+cinclude "arch/rs6000/conf/GENERIC.local"
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.142 src/sys/arch/shark/conf/GENERIC:1.143
--- src/sys/arch/shark/conf/GENERIC:1.142 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/shark/conf/GENERIC Thu Feb 9 13:16:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.143 2023/02/09 13:16:05 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.142 $"
+#ident "GENERIC-$Revision: 1.143 $"
# estimated number of users
maxusers 32
@@ -270,9 +270,6 @@ joy* at ofisa?
#vlpci* at ofbus?
#pci* at vlpci?
-# Pull in optional local configuration
-cinclude "arch/shark/conf/GENERIC.local"
-
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
@@ -312,3 +309,6 @@ 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"
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.237 src/sys/arch/sparc64/conf/GENERIC:1.238
--- src/sys/arch/sparc64/conf/GENERIC:1.237 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/sparc64/conf/GENERIC Thu Feb 9 13:16:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.237 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.238 2023/02/09 13:16:05 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.237 $"
+#ident "GENERIC-$Revision: 1.238 $"
maxusers 64
@@ -421,9 +421,6 @@ fdc0 at sbus? slot ? offset ? # SUNW,fd
#fdc0 at ebus? # fdthree, EXPERIMENTAL
fd* at fdc0 # the drive itself
-# Pull in optional local configuration
-cinclude "arch/sparc64/conf/GENERIC.local"
-
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
@@ -869,3 +866,6 @@ options PAX_SEGVGUARD=0 # PaX Segmenta
# options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
# 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"
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.93 src/sys/arch/zaurus/conf/GENERIC:1.94
--- src/sys/arch/zaurus/conf/GENERIC:1.93 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/zaurus/conf/GENERIC Thu Feb 9 13:16:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.93 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.94 2023/02/09 13:16:05 abs Exp $
#
# GENERIC machine description file
#
@@ -360,10 +360,6 @@ sdmmc* at pxamci?
ld* at sdmmc? # MMC/SD/SDHC card
-# Pull in optional local configuration
-cinclude "arch/zaurus/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -394,3 +390,6 @@ pseudo-device swwdog # software watch
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
+
+# Pull in optional local configuration
+cinclude "arch/zaurus/conf/GENERIC.local"
