INCLUDE_CONFIG_FILE in GENERIC

[M. Warner Losh]

In message: <20100114.102142.328914705071816274.imp at bsdimp.com>
            "M. Warner Losh" <imp at bsdimp.com> writes:
: Personally, I'd rather see us have two different options here, as
: suggested by others, so that it is clear and self-contained.  I'd vote
: for INCLUDE_CONFIG for today's behavior without -C, and
: INCLUDE_CONFIG_FILE for config -C.  -C then becomes a nop and the man
: page becomes correct.  We can then put a single line:
: 
: options 	INCLUDE_CONFIG_FILE    	 # include this config file in kernel
: 
: and be done with it in head.

Consider the following patches, and the following lines in GENERIC:

options 	INCLUDE_CONFIG_FILE    	 # include this config file in kernel
#options 	INCLUDE_CONFIG    	 # processed config, without comments

: For MFC, having the extra comment lines isn't so horrible as an
: explicitly granted exception to the rule of not doing that so others
: won't be tempted to do it too.

That was worded badly.  "I'm OK with merging the extra comments, so
long as it is clear to everybody that this is done as a special case
exception to the general rule that we don't do this."

Finally, I'd like to appologize to Doug for hijacking his simple
change and using it as an engine to make things better for the
project.

Warner

P.S.  I've also placed a copy of the diff at
http://people.freebsd.org/~imp/config.diff
-------------- next part --------------
A non-text attachment was scrubbed...
Name: config.diff
Type: text/x-patch
Size: 6064 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-head/attachments/20100114/8e202e8e/config.bin