Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Ensure GENERIC.local is always at the end of GENERIC
details: https://anonhg.NetBSD.org/src/rev/75abfc7ff03c
branches: trunk
changeset: 373432:75abfc7ff03c
user: abs <abs%NetBSD.org@localhost>
date: Thu Feb 09 13:16:04 2023 +0000
description:
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)
diffstat:
sys/arch/amd64/conf/GENERIC | 11 +++++------
sys/arch/evbarm/conf/GENERIC | 3 ++-
sys/arch/i386/conf/GENERIC | 12 +++++-------
sys/arch/ia64/conf/GENERIC | 10 +++++-----
sys/arch/landisk/conf/GENERIC | 11 +++++------
sys/arch/prep/conf/GENERIC | 10 +++++-----
sys/arch/riscv/conf/GENERIC | 5 +++--
sys/arch/rs6000/conf/GENERIC | 10 +++++-----
sys/arch/shark/conf/GENERIC | 10 +++++-----
sys/arch/sparc64/conf/GENERIC | 10 +++++-----
sys/arch/zaurus/conf/GENERIC | 9 ++++-----
11 files changed, 49 insertions(+), 52 deletions(-)
diffs (truncated from 351 to 300 lines):
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/amd64/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
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_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"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/evbarm/conf/GENERIC
--- a/sys/arch/evbarm/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/evbarm/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
include "dev/bluetooth/bluetoothdevices.config"
+# Pull in optional local configuration
cinclude "arch/evbarm/conf/GENERIC.local"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/i386/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
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_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"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/ia64/conf/GENERIC
--- a/sys/arch/ia64/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/ia64/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
#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 @@
# 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"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/landisk/conf/GENERIC
--- a/sys/arch/landisk/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/landisk/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
# 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_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"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/prep/conf/GENERIC
--- a/sys/arch/prep/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/prep/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
# 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 wsfont
include "dev/veriexec.config"
+
+# Pull in optional local configuration
+cinclude "arch/prep/conf/GENERIC.local"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/riscv/conf/GENERIC
--- a/sys/arch/riscv/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/riscv/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
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"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/rs6000/conf/GENERIC
--- a/sys/arch/rs6000/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/rs6000/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.47 $"
+#ident "GENERIC-$Revision: 1.48 $"
maxusers 32
@@ -188,9 +188,6 @@
#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 wsfont
include "dev/veriexec.config"
+
+# Pull in optional local configuration
+cinclude "arch/rs6000/conf/GENERIC.local"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/shark/conf/GENERIC
--- a/sys/arch/shark/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/shark/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
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 @@
#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 @@
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"
diff -r e19cb2bc3aa6 -r 75abfc7ff03c sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC Thu Feb 09 08:22:10 2023 +0000
+++ b/sys/arch/sparc64/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index