Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove GENERIC.local from the repository

Browse Source 
Make all the kernels that currently include their corresponding GENERIC.local
file use the cinclude directive instead of include.  This way config(1) will
not complain if the file cannot be found.

After doing this, remove the GENERIC.local files from the repository so that
the user will not see modified files during updates, and local changes to
them cannot end up in the repository by mistake.

Discussed in tech-kern@ earlier this month.  No strong objections.
This commit is contained in:
jmmv 2008-02-29 14:42:32 +00:00
parent 9f5371f02a
commit 055a66c56c
27 changed files with 42 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/amd64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.199 2008/01/30 19:58:20 ad Exp $
# $NetBSD: GENERIC,v 1.200 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.199 $"
#ident "GENERIC-$Revision: 1.200 $"
maxusers 64 # estimated number of users
@ -982,7 +982,7 @@ btsco* at bthub?
weasel* at pci?
# Pull in optional local configuration
include "arch/amd64/conf/GENERIC.local"
cinclude "arch/amd64/conf/GENERIC.local"
# Pseudo-Devices

5
sys/arch/amd64/conf/GENERIC.local
View File

@ -1,5 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2003/04/26 18:39:34 fvdl Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

4
sys/arch/amd64/conf/XEN3_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.9 2008/02/16 22:00:14 bouyer Exp $
# $NetBSD: XEN3_DOM0,v 1.10 2008/02/29 14:42:32 jmmv Exp $
include "arch/amd64/conf/std.xen"
@ -670,7 +670,7 @@ btsco* at bthub?
hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
include "arch/amd64/conf/GENERIC.local"
cinclude "arch/amd64/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/amd64/conf/XEN3_DOMU
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOMU,v 1.5 2008/02/02 17:23:44 joerg Exp $
# $NetBSD: XEN3_DOMU,v 1.6 2008/02/29 14:42:32 jmmv Exp $
include "arch/amd64/conf/std.xen"
@ -161,7 +161,7 @@ xbd* at xenbus? # Xen virtual block device
xencons* at hypervisor? # Xen virtual console
include "arch/amd64/conf/GENERIC.local"
cinclude "arch/amd64/conf/GENERIC.local"
# Pseudo-Devices

5
sys/arch/dreamcast/conf/GENERIC.local
View File

@ -1,5 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2000/12/11 18:19:12 marcus Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

5
sys/arch/evbsh3/conf/GENERIC.local
View File

@ -1,5 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 1999/09/13 10:30:23 itojun Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

6
sys/arch/i386/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.881 2008/01/30 19:58:19 ad Exp $
# $NetBSD: GENERIC,v 1.882 2008/02/29 14:42:32 jmmv 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.881 $"
#ident "GENERIC-$Revision: 1.882 $"
maxusers 64 # estimated number of users
@ -1416,7 +1416,7 @@ geodecntr* at geodegcb? # AMD Geode SC1100 high res. counter
weasel* at pci?
# Pull in optional local configuration
include "arch/i386/conf/GENERIC.local"
cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/i386/conf/GENERIC.local
View File

@ -1,4 +0,0 @@
# $NetBSD: GENERIC.local,v 1.3 2005/12/11 12:17:40 christos Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

4
sys/arch/i386/conf/GENERIC_TINY
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_TINY,v 1.111 2008/01/16 09:37:06 ad Exp $
# $NetBSD: GENERIC_TINY,v 1.112 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@ -546,7 +546,7 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
# Pull in optional local configuration
include "arch/i386/conf/GENERIC.local"
cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices

6
sys/arch/i386/conf/QEMU
View File

@ -1,4 +1,4 @@
# $NetBSD: QEMU,v 1.16 2008/01/16 09:37:07 ad Exp $
# $NetBSD: QEMU,v 1.17 2008/02/29 14:42:32 jmmv Exp $
#
# QEMU machine description file
#
@ -11,7 +11,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "QEMU-$Revision: 1.16 $"
#ident "QEMU-$Revision: 1.17 $"
maxusers 32 # estimated number of users
@ -388,7 +388,7 @@ midi* at pcppi? # MIDI interface to the PC speaker
spkr0 at pcppi? # PC speaker
# Pull in optional local configuration
include "arch/i386/conf/GENERIC.local"
cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/i386/conf/XEN2_DOM0
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN2_DOM0,v 1.39 2008/01/21 22:12:00 ichiro Exp $
# $NetBSD: XEN2_DOM0,v 1.40 2008/02/29 14:42:32 jmmv Exp $
include "arch/xen/conf/std.xen"
@ -687,7 +687,7 @@ btsco* at bthub?
hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
include "arch/i386/conf/GENERIC.local"
cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/i386/conf/XEN2_DOMU
View File

@ -1,4 +1,4 @@
# $NetBSD: XEN2_DOMU,v 1.13 2008/01/07 08:39:07 martti Exp $
# $NetBSD: XEN2_DOMU,v 1.14 2008/02/29 14:42:32 jmmv Exp $
include "arch/xen/conf/std.xen"
@ -176,7 +176,7 @@ xennet* at hypervisor? # Xen virtual network interface
xbd* at hypervisor? # Xen virtual block device
include "arch/i386/conf/GENERIC.local"
cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices

6
sys/arch/ia64/conf/GENERIC.SKI
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC.SKI,v 1.3 2006/09/10 21:07:20 cherry Exp $
# $NetBSD: GENERIC.SKI,v 1.4 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.3 $"
#ident "GENERIC-$Revision: 1.4 $"
maxusers 32 # estimated number of users
@ -70,7 +70,7 @@ cpu* at mainbus?
# Pull in optional local configuration
include "arch/ia64/conf/GENERIC.local"
cinclude "arch/ia64/conf/GENERIC.local"
# Console Devices
#ssccons* at mainbus0 # Ski console interface driver

5
sys/arch/ia64/conf/GENERIC.local
View File

@ -1,5 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2006/04/07 14:21:18 cherry Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

6
sys/arch/landisk/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.11 2007/12/31 15:31:58 ad Exp $
# $NetBSD: GENERIC,v 1.12 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.11 $"
#ident "GENERIC-$Revision: 1.12 $"
maxusers 16 # estimated number of users
@ -400,7 +400,7 @@ pwrsw0 at obio?
btn0 at obio?
# Pull in optional local configuration
include "arch/landisk/conf/GENERIC.local"
cinclude "arch/landisk/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/landisk/conf/GENERIC.local
View File

@ -1,4 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2006/09/01 21:26:18 uwe Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

5
sys/arch/mmeye/conf/GENERIC.local
View File

@ -1,5 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 1999/09/13 10:30:48 itojun Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

4
sys/arch/mmeye/conf/MMTA
View File

@ -1,4 +1,4 @@
# $NetBSD: MMTA,v 1.37 2008/02/02 17:54:17 uwe Exp $
# $NetBSD: MMTA,v 1.38 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC -- everything that's currently supported
#
@ -195,7 +195,7 @@ ukphy* at mii? phy ? # generic unknown PHYs
# Pull in optional local configuration
include "arch/mmeye/conf/GENERIC.local"
cinclude "arch/mmeye/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/mmeye/conf/MMTAICE
View File

@ -1,4 +1,4 @@
# $NetBSD: MMTAICE,v 1.39 2008/02/02 17:54:17 uwe Exp $
# $NetBSD: MMTAICE,v 1.40 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC -- everything that's currently supported
#
@ -221,7 +221,7 @@ ukphy* at mii? phy ? # generic unknown PHYs
# Pull in optional local configuration
include "arch/mmeye/conf/GENERIC.local"
cinclude "arch/mmeye/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/mmeye/conf/MMTAROMNEW
View File

@ -1,4 +1,4 @@
# $NetBSD: MMTAROMNEW,v 1.38 2008/02/02 17:54:17 uwe Exp $
# $NetBSD: MMTAROMNEW,v 1.39 2008/02/29 14:42:32 jmmv Exp $
#
# GENERIC -- everything that's currently supported
#
@ -199,7 +199,7 @@ ukphy* at mii? phy ? # generic unknown PHYs
# Pull in optional local configuration
include "arch/mmeye/conf/GENERIC.local"
cinclude "arch/mmeye/conf/GENERIC.local"
# Pseudo-Devices

6
sys/arch/prep/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.140 2008/02/13 14:05:06 tsutsui Exp $
# $NetBSD: GENERIC,v 1.141 2008/02/29 14:42:33 jmmv 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.140 $"
#ident "GENERIC-$Revision: 1.141 $"
maxusers 32
@ -517,7 +517,7 @@ ukphy* at mii? phy ? # generic unknown PHYs
#joy0 at isa? port 0x201
# Pull in optional local configuration
include "arch/prep/conf/GENERIC.local"
cinclude "arch/prep/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/prep/conf/GENERIC.local
View File

@ -1,4 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2006/05/10 17:28:41 garbled Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

6
sys/arch/rs6000/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.2 2007/12/31 15:32:04 ad Exp $
# $NetBSD: GENERIC,v 1.3 2008/02/29 14:42:33 jmmv Exp $
#
# GENERIC machine description file
#
@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
#ident "GENERIC-$Revision: 1.2 $"
#ident "GENERIC-$Revision: 1.3 $"
maxusers 32
@ -203,7 +203,7 @@ com* at ioplanar?
#uk* at scsibus? target ? lun ? # SCSI unknown
# Pull in optional local configuration
include "arch/rs6000/conf/GENERIC.local"
cinclude "arch/rs6000/conf/GENERIC.local"
# Pseudo-Devices

4
sys/arch/rs6000/conf/GENERIC.local
View File

@ -1,4 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2007/12/17 19:09:03 garbled Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

6
sys/arch/shark/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.77 2008/02/09 22:18:11 jmmv Exp $
# $NetBSD: GENERIC,v 1.78 2008/02/29 14:42:33 jmmv Exp $
#
# Generic Shark configuration.
#
@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.77 $"
#ident "GENERIC-$Revision: 1.78 $"
# estimated number of users
maxusers 32
@ -279,7 +279,7 @@ midi* at opl?
joy* at ofisa?
# Pull in optional local configuration
include "arch/shark/conf/GENERIC.local"
cinclude "arch/shark/conf/GENERIC.local"
pseudo-device loop 1 # network loopback
pseudo-device bpfilter # packet filter

4
sys/arch/shark/conf/GENERIC.local
View File

@ -1,4 +0,0 @@
# $NetBSD: GENERIC.local,v 1.1 2008/02/09 22:18:11 jmmv Exp $
#
# GENERIC.local -- local additions to the GENERIC configuration
#

4
sys/arch/shark/conf/OFWGENCFG
View File

@ -1,4 +1,4 @@
# $NetBSD: OFWGENCFG,v 1.29 2008/02/09 22:18:11 jmmv Exp $
# $NetBSD: OFWGENCFG,v 1.30 2008/02/29 14:42:33 jmmv Exp $
#
# OFWGENCFG: 'generic' configuration for Open Firmware boards.
#
@ -133,7 +133,7 @@ ofrtc* at ofbus?
ofrom* at ofbus?
# Pull in optional local configuration
include "arch/shark/conf/GENERIC.local"
cinclude "arch/shark/conf/GENERIC.local"
pseudo-device loop 1 # network loopback
pseudo-device bpfilter # packet filter