diff options
| author | abs <abs@NetBSD.org> | 2023-02-09 14:09:47 +0000 |
|---|---|---|
| committer | abs <abs@NetBSD.org> | 2023-02-09 14:09:47 +0000 |
| commit | b1eec2d7e03420122b47d945f71fd65ddfe682b5 (patch) | |
| tree | 9c2f498d7e6c0b257f6c8ec6799af30a0fe75f0c /sys/arch/i386 | |
| parent | 97b50d273cf87521d8039f58c3184269fbc1aee9 (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/i386')
| -rw-r--r-- | sys/arch/i386/conf/ALL | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC_TINY | 9 | ||||
| -rw-r--r-- | sys/arch/i386/conf/INSTALL_FLOPPY | 7 | ||||
| -rw-r--r-- | sys/arch/i386/conf/INSTALL_TINY | 8 | ||||
| -rw-r--r-- | sys/arch/i386/conf/XEN3PAE_DOM0 | 9 | ||||
| -rw-r--r-- | sys/arch/i386/conf/XEN3PAE_DOMU | 9 |
7 files changed, 28 insertions, 28 deletions
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index 943b2df23f7..4179d858a5d 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.505 2022/12/22 19:09:48 jakllsch Exp $ +# $NetBSD: ALL,v 1.506 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 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.505 $" +#ident "ALL-$Revision: 1.506 $" maxusers 64 # estimated number of users @@ -1704,7 +1704,7 @@ flash* at flashbus? # NAND subsystem nand* at nandbus? -# Pull in optional local configuration +# Pull in optional local configuration - always at end #include "arch/i386/conf/ALL.local" diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 4f610160ce8..19091f1e62d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1245 2023/02/09 13:16:04 abs Exp $ +# $NetBSD: GENERIC,v 1.1246 2023/02/09 14:09:48 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.1245 $" +#ident "GENERIC-$Revision: 1.1246 $" maxusers 64 # estimated number of users @@ -1516,5 +1516,5 @@ 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" +# Pull in optional local configuration - always at end +cinclude "arch/i386/conf/GENERIC.local" diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY index cf084be8442..27afc0ebc75 100644 --- a/sys/arch/i386/conf/GENERIC_TINY +++ b/sys/arch/i386/conf/GENERIC_TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.170 2021/01/21 06:51:55 nia Exp $ +# $NetBSD: GENERIC_TINY,v 1.171 2023/02/09 14:09:48 abs Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -492,10 +492,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10 # 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/i386/conf/GENERIC.local" - - # Pseudo-Devices # disk/mass storage pseudo-devices @@ -524,3 +520,6 @@ pseudo-device clockctl # user control of clock subsystem # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor + +# Pull in optional local configuration - always at end +cinclude "arch/i386/conf/GENERIC.local" diff --git a/sys/arch/i386/conf/INSTALL_FLOPPY b/sys/arch/i386/conf/INSTALL_FLOPPY index 0e45199a171..d2ab9d63206 100644 --- a/sys/arch/i386/conf/INSTALL_FLOPPY +++ b/sys/arch/i386/conf/INSTALL_FLOPPY @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.56 2021/01/21 06:51:55 nia Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.57 2023/02/09 14:09:48 abs Exp $ # # INSTALL - Installation kernel. # @@ -713,9 +713,6 @@ viomb* at virtio? # Virtio memory balloon device ld* at virtio? # Virtio disk device vioif* at virtio? # Virtio network device -# Pull in optional local configuration -cinclude "arch/i386/conf/INSTALL.local" - # Pseudo-Devices @@ -749,3 +746,5 @@ options NO_DEV_PTM pseudo-device wsmux # mouse & keyboard multiplexor #pseudo-device wsfont +# Pull in optional local configuration - always at end +cinclude "arch/i386/conf/INSTALL.local" diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY index 4e6207e1900..4ef81dbcee3 100644 --- a/sys/arch/i386/conf/INSTALL_TINY +++ b/sys/arch/i386/conf/INSTALL_TINY @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_TINY,v 1.163 2021/01/21 06:51:55 nia Exp $ +# $NetBSD: INSTALL_TINY,v 1.164 2023/02/09 14:09:48 abs Exp $ # # This kernel should be derived from INSTALL (which is derived # from GENERIC) with some features commented out. @@ -461,9 +461,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10 # 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/i386/conf/INSTALL.local" - # Pseudo-Devices # disk/mass storage pseudo-devices @@ -483,3 +480,6 @@ pseudo-device loop # network loopback pseudo-device pty # pseudo-terminals options NO_DEV_PTM #options RND_COM # use "com" randomness as well (BROKEN) + +# Pull in optional local configuration - always at end +cinclude "arch/i386/conf/INSTALL.local" diff --git a/sys/arch/i386/conf/XEN3PAE_DOM0 b/sys/arch/i386/conf/XEN3PAE_DOM0 index 70baff3571f..1a6e64ffe62 100644 --- a/sys/arch/i386/conf/XEN3PAE_DOM0 +++ b/sys/arch/i386/conf/XEN3PAE_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.36 2022/08/07 02:52:26 simonb Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.37 2023/02/09 14:09:48 abs Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -769,9 +769,6 @@ btsco* at bthub? hifn* at pci? dev ? function ? # Hifn 7755/7811/795x ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x -cinclude "arch/i386/conf/GENERIC.local" -cinclude "arch/i386/conf/XEN3_DOM0.local" - # Pseudo-Devices pseudo-device crypto # /dev/crypto device @@ -884,3 +881,7 @@ acpiecdt* at acpi? # ACPI Embedded Controller (early binding) acpilid* at acpi? # ACPI Lid Switch aibs* at acpi? # ASUSTeK AI Booster hardware monitor hpqlb* at acpi? # HP Quick Launch Buttons + +# Pull in optional local configuration - always at end +cinclude "arch/i386/conf/GENERIC.local" +cinclude "arch/i386/conf/XEN3_DOM0.local" diff --git a/sys/arch/i386/conf/XEN3PAE_DOMU b/sys/arch/i386/conf/XEN3PAE_DOMU index ede118db799..46a62b1e723 100644 --- a/sys/arch/i386/conf/XEN3PAE_DOMU +++ b/sys/arch/i386/conf/XEN3PAE_DOMU @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOMU,v 1.18 2022/08/07 02:52:26 simonb Exp $ +# $NetBSD: XEN3PAE_DOMU,v 1.19 2023/02/09 14:09:48 abs Exp $ include "arch/i386/conf/std.xen" @@ -164,9 +164,6 @@ xennet* at xenbus? # Xen virtual network interface xbd* at xenbus? # Xen virtual block device balloon* at xenbus? # Xen balloon device -cinclude "arch/i386/conf/GENERIC.local" -cinclude "arch/i386/conf/XEN3_DOMU.local" - # Pseudo-Devices pseudo-device crypto # /dev/crypto device @@ -232,3 +229,7 @@ options PAX_ASLR=0 # PaX Address Space Layout Randomization #xpci* at xenbus ? #Xen3 PCI front end driver #pci* at xpci ? # you then need to add your PCI devices drivers below. + +# Pull in optional local configuration - always at end +cinclude "arch/i386/conf/GENERIC.local" +cinclude "arch/i386/conf/XEN3_DOMU.local" |
