Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Add optoion GENERIC.local include to the end of ~al...
details: https://anonhg.NetBSD.org/src/rev/cf0bd974507c
branches: trunk
changeset: 373485:cf0bd974507c
user: abs <abs%NetBSD.org@localhost>
date: Sun Feb 12 14:50:37 2023 +0000
description:
Add optoion GENERIC.local include to the end of ~all GENERIC configs
This excludes atari, sgimips, evbmips, evbppc, evbsh3, and hpcarm
all of which have somewhat specific kernel config file layouts
diffstat:
sys/arch/acorn32/conf/GENERIC | 7 +++++--
sys/arch/amiga/conf/GENERIC | 7 +++++--
sys/arch/amiga/conf/GENERIC.in | 7 +++++--
sys/arch/amigappc/conf/GENERIC | 7 +++++--
sys/arch/arc/conf/GENERIC | 7 +++++--
sys/arch/bebox/conf/GENERIC | 7 +++++--
sys/arch/cats/conf/GENERIC | 5 ++++-
sys/arch/cesfic/conf/GENERIC | 5 ++++-
sys/arch/cobalt/conf/GENERIC | 7 +++++--
sys/arch/dreamcast/conf/GENERIC | 5 ++++-
sys/arch/emips/conf/GENERIC | 7 +++++--
sys/arch/epoc32/conf/GENERIC | 7 +++++--
sys/arch/ews4800mips/conf/GENERIC | 7 +++++--
sys/arch/hp300/conf/GENERIC | 7 +++++--
sys/arch/hpcmips/conf/GENERIC | 7 +++++--
sys/arch/hpcsh/conf/GENERIC | 5 ++++-
sys/arch/hppa/conf/GENERIC | 7 +++++--
sys/arch/ibmnws/conf/GENERIC | 5 ++++-
sys/arch/iyonix/conf/GENERIC | 7 +++++--
sys/arch/luna68k/conf/GENERIC | 7 +++++--
sys/arch/mac68k/conf/GENERIC | 7 +++++--
sys/arch/mipsco/conf/GENERIC | 5 ++++-
sys/arch/mmeye/conf/GENERIC | 7 +++++--
sys/arch/mvme68k/conf/GENERIC | 7 +++++--
sys/arch/mvmeppc/conf/GENERIC | 7 +++++--
sys/arch/netwinder/conf/GENERIC | 5 ++++-
sys/arch/news68k/conf/GENERIC | 7 +++++--
sys/arch/newsmips/conf/GENERIC | 7 +++++--
sys/arch/next68k/conf/GENERIC | 7 +++++--
sys/arch/ofppc/conf/GENERIC | 7 +++++--
sys/arch/playstation2/conf/GENERIC | 5 ++++-
sys/arch/pmax/conf/GENERIC | 7 +++++--
sys/arch/sandpoint/conf/GENERIC | 7 +++++--
sys/arch/sbmips/conf/GENERIC | 7 +++++--
sys/arch/sparc/conf/GENERIC | 7 +++++--
sys/arch/sun2/conf/GENERIC | 7 +++++--
sys/arch/sun3/conf/GENERIC | 7 +++++--
sys/arch/vax/conf/GENERIC | 7 +++++--
sys/arch/x68k/conf/GENERIC | 7 +++++--
39 files changed, 187 insertions(+), 70 deletions(-)
diffs (truncated from 900 to 300 lines):
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/acorn32/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.136 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.137 2023/02/12 14:50:37 abs Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.136 $"
+#ident "GENERIC-$Revision: 1.137 $"
# estimated number of users
maxusers 32
@@ -336,3 +336,6 @@
#makeoptions MONITOR="Taxan875+LR"
#makeoptions MONITOR="AKF60"
#makeoptions MODES="1024,768,60 1024,768,70 800,600,60 640,480,60 1280,1024 1152,900"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/acorn32/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/amiga/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.337 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.338 2023/02/12 14:50:38 abs Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.337 $"
+#ident "GENERIC-$Revision: 1.338 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -601,3 +601,6 @@
include "dev/veriexec.config"
config netbsd root on ? type ?
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amiga/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.150 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: GENERIC.in,v 1.151 2023/02/12 14:50:38 abs Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.150 $"
+#ident "GENERIC-$Revision: 1.151 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os -fno-omit-frame-pointer"
@@ -711,3 +711,6 @@
include "dev/veriexec.config"
config netbsd root on ? type ?
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amiga/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/amigappc/conf/GENERIC
--- a/sys/arch/amigappc/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/amigappc/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.44 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.45 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.44 $"
+#ident "GENERIC-$Revision: 1.45 $"
maxusers 8
@@ -435,3 +435,6 @@
# Kernel root file system and dump configuration
config netbsd root on ? type ?
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amigappc/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/arc/conf/GENERIC
--- a/sys/arch/arc/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/arc/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.202 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.203 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.202 $"
+#ident "GENERIC-$Revision: 1.203 $"
maxusers 32 # estimated number of users
@@ -481,3 +481,6 @@
pseudo-device ksyms # /dev/ksyms
#include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/arc/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/bebox/conf/GENERIC
--- a/sys/arch/bebox/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/bebox/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.169 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.168 $"
+#ident "GENERIC-$Revision: 1.169 $"
maxusers 32
@@ -325,3 +325,6 @@
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
+# Pull in optional local configuration - always at end
+cinclude "arch/bebox/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/cats/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.186 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.187 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -563,3 +563,6 @@
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/cats/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/cesfic/conf/GENERIC
--- a/sys/arch/cesfic/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/cesfic/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.77 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.78 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -137,3 +137,6 @@
pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/cesfic/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/cobalt/conf/GENERIC
--- a/sys/arch/cobalt/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/cobalt/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.172 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.173 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.172 $"
+#ident "GENERIC-$Revision: 1.173 $"
maxusers 32
@@ -345,3 +345,6 @@
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/cobalt/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/dreamcast/conf/GENERIC
--- a/sys/arch/dreamcast/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.136 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.137 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -222,3 +222,6 @@
# Veriexec
# include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/dreamcast/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/emips/conf/GENERIC
--- a/sys/arch/emips/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/emips/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.26 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.27 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.26 $"
+#ident "GENERIC-$Revision: 1.27 $"
maxusers 64
@@ -210,3 +210,6 @@
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device swwdog # software watchdog timer -- swwdog(4)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/emips/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/epoc32/conf/GENERIC
--- a/sys/arch/epoc32/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/epoc32/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.17 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.18 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.17 $"
+#ident "GENERIC-$Revision: 1.18 $"
maxusers 32 # estimated number of users
@@ -193,3 +193,6 @@
# wscons pseudo-devices
#pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
+
+# Pull in optional local configuration - always at end
+cinclude "arch/epoc32/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/ews4800mips/conf/GENERIC
--- a/sys/arch/ews4800mips/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
+++ b/sys/arch/ews4800mips/conf/GENERIC Sun Feb 12 14:50:37 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.66 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.67 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
# This machine description file is used to generate the default NetBSD
@@ -25,7 +25,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.66 $"
+#ident "GENERIC-$Revision: 1.67 $"
maxusers 16
@@ -266,3 +266,6 @@
pseudo-device wsmux
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/ews4800mips/conf/GENERIC.local"
diff -r 1acc58ce0307 -r cf0bd974507c sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC Sun Feb 12 13:38:37 2023 +0000
Home |
Main Index |
Thread Index |
Old Index