Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Adjust _all_ cinclude of *.local files
details: https://anonhg.NetBSD.org/src/rev/ed83051ddbae
branches: trunk
changeset: 373433:ed83051ddbae
user: abs <abs%NetBSD.org@localhost>
date: Thu Feb 09 14:09:47 2023 +0000
description:
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
diffstat:
sys/arch/alpha/conf/GENERIC | 6 +++---
sys/arch/amd64/conf/ALL | 6 +++---
sys/arch/amd64/conf/GENERIC | 8 ++++----
sys/arch/amd64/conf/XEN3_DOM0 | 10 ++++------
sys/arch/amd64/conf/XEN3_DOMU | 11 ++++++-----
sys/arch/evbarm/conf/GENERIC | 6 +++---
sys/arch/evbarm/conf/GENERIC64 | 5 +++--
sys/arch/evbarm/conf/KOBO | 6 +++---
sys/arch/evbarm/conf/NETWALKER | 6 +++---
sys/arch/evbarm/conf/RPI | 7 +++----
sys/arch/evbmips/conf/CI20 | 6 +++---
sys/arch/evbmips/conf/OCTEON | 5 +++--
sys/arch/evbppc/conf/TWRP1025 | 5 +++--
sys/arch/i386/conf/ALL | 6 +++---
sys/arch/i386/conf/GENERIC | 8 ++++----
sys/arch/i386/conf/GENERIC_TINY | 9 ++++-----
sys/arch/i386/conf/INSTALL_FLOPPY | 7 +++----
sys/arch/i386/conf/INSTALL_TINY | 8 ++++----
sys/arch/i386/conf/XEN3PAE_DOM0 | 9 +++++----
sys/arch/i386/conf/XEN3PAE_DOMU | 9 +++++----
sys/arch/ia64/conf/GENERIC | 8 ++++----
sys/arch/ia64/conf/GENERIC.SKI | 11 +++++------
sys/arch/landisk/conf/GENERIC | 8 ++++----
sys/arch/macppc/conf/GENERIC | 8 ++++----
sys/arch/macppc/conf/POWERMAC_G5 | 1 +
sys/arch/mmeye/conf/MMTA | 10 ++++------
sys/arch/mmeye/conf/MMTAICE | 10 ++++------
sys/arch/mmeye/conf/MMTAROMNEW | 10 ++++------
sys/arch/prep/conf/GENERIC | 8 ++++----
sys/arch/prep/conf/INSTALL | 4 ++--
sys/arch/prep/conf/INSTALL_SMALL | 4 ++--
sys/arch/riscv/conf/GENERIC | 6 +++---
sys/arch/rs6000/conf/GENERIC | 8 ++++----
sys/arch/shark/conf/GENERIC | 8 ++++----
sys/arch/shark/conf/OFWGENCFG | 8 ++++----
sys/arch/sparc64/conf/GENERIC | 8 ++++----
sys/arch/usermode/conf/GENERIC.common | 8 ++++----
sys/arch/zaurus/conf/GENERIC | 6 +++---
38 files changed, 136 insertions(+), 141 deletions(-)
diffs (truncated from 935 to 300 lines):
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/alpha/conf/GENERIC Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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 @@
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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/amd64/conf/ALL Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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 @@
# NAND subsystem
nand* at nandbus?
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
#include "arch/amd64/conf/ALL.local"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/amd64/conf/GENERIC Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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_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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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 @@
# 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 xvif
pseudo-device xbdback
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU Thu Feb 09 14:09:47 2023 +0000
@@ -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 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 @@
#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 @@
# 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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbarm/conf/GENERIC
--- a/sys/arch/evbarm/conf/GENERIC Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbarm/conf/GENERIC Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64 Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64 Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbarm/conf/KOBO
--- a/sys/arch/evbarm/conf/KOBO Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbarm/conf/KOBO Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbarm/conf/NETWALKER
--- a/sys/arch/evbarm/conf/NETWALKER Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbarm/conf/NETWALKER Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbarm/conf/RPI
--- a/sys/arch/evbarm/conf/RPI Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbarm/conf/RPI Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
# 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"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbmips/conf/CI20
--- a/sys/arch/evbmips/conf/CI20 Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbmips/conf/CI20 Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
#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 @@
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbmips/conf/CI20.local"
-
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbmips/conf/OCTEON
--- a/sys/arch/evbmips/conf/OCTEON Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbmips/conf/OCTEON Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbmips/conf/OCTEON.local"
diff -r 75abfc7ff03c -r ed83051ddbae sys/arch/evbppc/conf/TWRP1025
--- a/sys/arch/evbppc/conf/TWRP1025 Thu Feb 09 13:16:04 2023 +0000
+++ b/sys/arch/evbppc/conf/TWRP1025 Thu Feb 09 14:09:47 2023 +0000
@@ -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 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
Home |
Main Index |
Thread Index |
Old Index