summaryrefslogtreecommitdiff
path: root/sys/arch/prep
diff options
context:
space:
mode:
authorabs <abs@NetBSD.org>2023-02-09 14:09:47 +0000
committerabs <abs@NetBSD.org>2023-02-09 14:09:47 +0000
commitb1eec2d7e03420122b47d945f71fd65ddfe682b5 (patch)
tree9c2f498d7e6c0b257f6c8ec6799af30a0fe75f0c /sys/arch/prep
parent97b50d273cf87521d8039f58c3184269fbc1aee9 (diff)
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 (limited to 'sys/arch/prep')
-rw-r--r--sys/arch/prep/conf/GENERIC8
-rw-r--r--sys/arch/prep/conf/INSTALL4
-rw-r--r--sys/arch/prep/conf/INSTALL_SMALL4
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index fa32865e499..0ef18ad00e4 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -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"
diff --git a/sys/arch/prep/conf/INSTALL b/sys/arch/prep/conf/INSTALL
index a9beaccf04d..ec16e4fa63d 100644
--- a/sys/arch/prep/conf/INSTALL
+++ b/sys/arch/prep/conf/INSTALL
@@ -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
diff --git a/sys/arch/prep/conf/INSTALL_SMALL b/sys/arch/prep/conf/INSTALL_SMALL
index f8259d0c6d3..788767d0557 100644
--- a/sys/arch/prep/conf/INSTALL_SMALL
+++ b/sys/arch/prep/conf/INSTALL_SMALL
@@ -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