head	1.42;
access;
symbols
	RELENG_8_4:1.41.0.2
	RELENG_9_1_0_RELEASE:1.40.2.1.4.2
	RELENG_9_1:1.40.2.1.0.4
	RELENG_9_1_BP:1.40.2.1
	RELENG_8_3_0_RELEASE:1.39.2.1.8.1
	RELENG_8_3:1.39.2.1.0.8
	RELENG_8_3_BP:1.39.2.1
	RELENG_9_0_0_RELEASE:1.40.2.1.2.1
	RELENG_9_0:1.40.2.1.0.2
	RELENG_9_0_BP:1.40.2.1
	RELENG_9:1.40.0.2
	RELENG_9_BP:1.40
	RELENG_7_4_0_RELEASE:1.38.12.1
	RELENG_8_2_0_RELEASE:1.39.2.1.6.1
	RELENG_7_4:1.38.0.12
	RELENG_7_4_BP:1.38
	RELENG_8_2:1.39.2.1.0.6
	RELENG_8_2_BP:1.39.2.1
	RELENG_8_1_0_RELEASE:1.39.2.1.4.1
	RELENG_8_1:1.39.2.1.0.4
	RELENG_8_1_BP:1.39.2.1
	RELENG_7_3_0_RELEASE:1.38.10.1
	RELENG_7_3:1.38.0.10
	RELENG_7_3_BP:1.38
	RELENG_8_0_0_RELEASE:1.39.2.1.2.1
	RELENG_8_0:1.39.2.1.0.2
	RELENG_8_0_BP:1.39.2.1
	RELENG_8:1.39.0.2
	RELENG_8_BP:1.39
	RELENG_7_2_0_RELEASE:1.38.8.1
	RELENG_7_2:1.38.0.8
	RELENG_7_2_BP:1.38
	RELENG_7_1_0_RELEASE:1.38.6.1
	RELENG_6_4_0_RELEASE:1.34.20.1
	RELENG_7_1:1.38.0.6
	RELENG_7_1_BP:1.38
	RELENG_6_4:1.34.0.20
	RELENG_6_4_BP:1.34
	RELENG_7_0_0_RELEASE:1.38
	RELENG_6_3_0_RELEASE:1.34
	RELENG_7_0:1.38.0.4
	RELENG_7_0_BP:1.38
	RELENG_6_3:1.34.0.18
	RELENG_6_3_BP:1.34
	RELENG_7:1.38.0.2
	RELENG_7_BP:1.38
	RELENG_6_2_0_RELEASE:1.34
	RELENG_6_2:1.34.0.16
	RELENG_6_2_BP:1.34
	RELENG_5_5_0_RELEASE:1.34
	RELENG_5_5:1.34.0.14
	RELENG_5_5_BP:1.34
	RELENG_6_1_0_RELEASE:1.34
	RELENG_6_1:1.34.0.12
	RELENG_6_1_BP:1.34
	RELENG_6_0_0_RELEASE:1.34
	RELENG_6_0:1.34.0.10
	RELENG_6_0_BP:1.34
	RELENG_6:1.34.0.8
	RELENG_6_BP:1.34
	RELENG_5_4_0_RELEASE:1.34
	RELENG_5_4:1.34.0.6
	RELENG_5_4_BP:1.34
	RELENG_4_11_0_RELEASE:1.26.2.1
	RELENG_4_11:1.26.2.1.0.16
	RELENG_4_11_BP:1.26.2.1
	RELENG_5_3_0_RELEASE:1.34
	RELENG_5_3:1.34.0.4
	RELENG_5_3_BP:1.34
	RELENG_5:1.34.0.2
	RELENG_5_BP:1.34
	RELENG_4_10_0_RELEASE:1.26.2.1
	RELENG_4_10:1.26.2.1.0.14
	RELENG_4_10_BP:1.26.2.1
	RELENG_5_2_1_RELEASE:1.33
	RELENG_5_2_0_RELEASE:1.33
	RELENG_5_2:1.33.0.2
	RELENG_5_2_BP:1.33
	RELENG_4_9_0_RELEASE:1.26.2.1
	RELENG_4_9:1.26.2.1.0.12
	RELENG_4_9_BP:1.26.2.1
	RELENG_5_1_0_RELEASE:1.31
	RELENG_5_1:1.31.0.4
	RELENG_5_1_BP:1.31
	RELENG_4_8_0_RELEASE:1.26.2.1
	RELENG_4_8:1.26.2.1.0.10
	RELENG_4_8_BP:1.26.2.1
	RELENG_5_0_0_RELEASE:1.31
	RELENG_5_0:1.31.0.2
	RELENG_5_0_BP:1.31
	RELENG_4_7_0_RELEASE:1.26.2.1
	RELENG_4_7:1.26.2.1.0.8
	RELENG_4_7_BP:1.26.2.1
	RELENG_4_6_2_RELEASE:1.26.2.1
	RELENG_4_6_1_RELEASE:1.26.2.1
	RELENG_4_6_0_RELEASE:1.26.2.1
	RELENG_4_6:1.26.2.1.0.6
	RELENG_4_6_BP:1.26.2.1
	RELENG_4_5_0_RELEASE:1.26.2.1
	RELENG_4_5:1.26.2.1.0.4
	RELENG_4_5_BP:1.26.2.1
	RELENG_4_4_0_RELEASE:1.26.2.1
	RELENG_4_4:1.26.2.1.0.2
	RELENG_4_4_BP:1.26.2.1
	RELENG_4_3_0_RELEASE:1.26
	RELENG_4_3:1.26.0.4
	RELENG_4_3_BP:1.26
	RELENG_4_2_0_RELEASE:1.26
	RELENG_4_1_1_RELEASE:1.26
	PRE_SMPNG:1.27
	RELENG_4_1_0_RELEASE:1.26
	RELENG_3_5_0_RELEASE:1.20.2.1
	RELENG_4_0_0_RELEASE:1.26
	RELENG_4:1.26.0.2
	RELENG_4_BP:1.26
	RELENG_3_4_0_RELEASE:1.20.2.1
	RELENG_3_3_0_RELEASE:1.20.2.1
	RELENG_3_2_PAO:1.20.0.4
	RELENG_3_2_PAO_BP:1.20
	RELENG_3_2_0_RELEASE:1.20
	RELENG_3_1_0_RELEASE:1.20
	RELENG_3:1.20.0.2
	RELENG_3_BP:1.20
	RELENG_2_2_8_RELEASE:1.12
	RELENG_3_0_0_RELEASE:1.20
	RELENG_2_2_7_RELEASE:1.12
	RELENG_2_2_6_RELEASE:1.12
	RELENG_2_2_5_RELEASE:1.12
	bsd_44_lite_2:1.1.1.1
	RELENG_2_2_2_RELEASE:1.12
	RELENG_2_2_1_RELEASE:1.12
	RELENG_2_2_0_RELEASE:1.12
	RELENG_2_1_7_RELEASE:1.7.4.2
	RELENG_2_1_6_1_RELEASE:1.7.4.2
	RELENG_2_1_6_RELEASE:1.7.4.2
	RELENG_2_2:1.12.0.2
	RELENG_2_2_BP:1.12
	RELENG_2_1_5_RELEASE:1.7.4.2
	RELENG_2_1_0_RELEASE:1.7.4.1
	RELENG_2_1_0:1.7.0.4
	RELENG_2_1_0_BP:1.7
	RELENG_2_0_5_RELEASE:1.7
	RELENG_2_0_5:1.7.0.2
	RELENG_2_0_5_BP:1.7
	RELENG_2_0_5_ALPHA:1.7
	RELEASE_2_0:1.5
	BETA_2_0:1.5
	ALPHA_2_0:1.5.0.2
	bsd_44_lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.42
date	2013.04.20.00.35.21;	author svnexp;	state Exp;
branches;
next	1.41;

1.41
date	2012.11.17.01.54.42;	author svnexp;	state Exp;
branches
	1.41.2.1;
next	1.40;

1.40
date	2010.01.02.11.07.44;	author ed;	state Exp;
branches
	1.40.2.1;
next	1.39;

1.39
date	2008.06.06.00.01.22;	author peter;	state Exp;
branches
	1.39.2.1;
next	1.38;

1.38
date	2007.10.01.18.15.11;	author ru;	state Exp;
branches
	1.38.2.1
	1.38.6.1
	1.38.8.1
	1.38.10.1
	1.38.12.1;
next	1.37;

1.37
date	2007.05.12.20.33.13;	author wkoszek;	state Exp;
branches;
next	1.36;

1.36
date	2007.05.12.19.38.18;	author wkoszek;	state Exp;
branches;
next	1.35;

1.35
date	2005.12.09.06.46.40;	author ru;	state Exp;
branches;
next	1.34;

1.34
date	2004.05.11.15.42.44;	author cognet;	state Exp;
branches
	1.34.8.1
	1.34.20.1;
next	1.33;

1.33
date	2003.06.11.21.27.37;	author obrien;	state Exp;
branches;
next	1.32;

1.32
date	2003.06.11.21.25.15;	author obrien;	state Exp;
branches;
next	1.31;

1.31
date	2001.07.20.06.19.40;	author obrien;	state Exp;
branches;
next	1.30;

1.30
date	2001.03.26.14.39.45;	author ru;	state Exp;
branches;
next	1.29;

1.29
date	2001.03.20.18.16.21;	author ru;	state Exp;
branches;
next	1.28;

1.28
date	2001.02.19.04.43.21;	author peter;	state Exp;
branches;
next	1.27;

1.27
date	2000.06.13.22.28.41;	author peter;	state Exp;
branches;
next	1.26;

1.26
date	99.10.10.17.36.09;	author peter;	state Exp;
branches
	1.26.2.1;
next	1.25;

1.25
date	99.08.28.01.15.47;	author peter;	state Exp;
branches;
next	1.24;

1.24
date	99.05.09.18.54.21;	author peter;	state Exp;
branches;
next	1.23;

1.23
date	99.04.18.13.36.28;	author peter;	state Exp;
branches;
next	1.22;

1.22
date	99.04.17.14.41.40;	author peter;	state Exp;
branches;
next	1.21;

1.21
date	99.04.13.18.22.57;	author peter;	state Exp;
branches;
next	1.20;

1.20
date	98.05.06.15.27.57;	author bde;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	98.05.05.07.36.44;	author bde;	state Exp;
branches;
next	1.18;

1.18
date	98.05.04.20.09.05;	author bde;	state Exp;
branches;
next	1.17;

1.17
date	98.03.06.15.02.45;	author bde;	state Exp;
branches;
next	1.16;

1.16
date	98.02.19.00.51.46;	author eivind;	state Exp;
branches;
next	1.15;

1.15
date	97.10.22.00.44.08;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	97.09.07.12.27.54;	author bde;	state Exp;
branches;
next	1.13;

1.13
date	97.09.07.10.35.15;	author bde;	state Exp;
branches;
next	1.12;

1.12
date	96.06.02.17.21.55;	author phk;	state Exp;
branches;
next	1.11;

1.11
date	96.05.30.23.16.23;	author phk;	state Exp;
branches;
next	1.10;

1.10
date	95.12.11.10.52.17;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	95.11.28.20.29.57;	author wollman;	state Exp;
branches;
next	1.8;

1.8
date	95.09.28.18.24.54;	author bde;	state Exp;
branches;
next	1.7;

1.7
date	95.02.22.15.37.28;	author jkh;	state Exp;
branches
	1.7.4.1;
next	1.6;

1.6
date	94.11.27.16.16.34;	author bde;	state Exp;
branches;
next	1.5;

1.5
date	94.09.06.20.04.37;	author wollman;	state Exp;
branches;
next	1.4;

1.4
date	94.08.18.05.15.22;	author davidg;	state Exp;
branches;
next	1.3;

1.3
date	94.08.18.05.11.29;	author davidg;	state Exp;
branches;
next	1.2;

1.2
date	94.05.26.13.23.52;	author rgrimes;	state Exp;
branches;
next	1.1;

1.1
date	94.05.26.05.22.25;	author rgrimes;	state Exp;
branches
	1.1.1.1;
next	;

1.41.2.1
date	2012.11.17.01.54.42;	author svnexp;	state dead;
branches;
next	1.41.2.2;

1.41.2.2
date	2013.03.28.13.06.14;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.40.2.1.2.1
	1.40.2.1.4.1;
next	1.40.2.2;

1.40.2.2
date	2012.11.17.11.37.43;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.40.2.1.2.2;

1.40.2.1.2.2
date	2012.11.17.08.37.40;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.40.2.1.4.2;

1.40.2.1.4.2
date	2012.11.17.08.48.31;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.39.2.1.2.1
	1.39.2.1.4.1
	1.39.2.1.6.1
	1.39.2.1.8.1;
next	1.39.2.2;

1.39.2.2
date	2012.11.17.10.37.21;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.39.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.39.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.39.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.39.2.1.8.2;

1.39.2.1.8.2
date	2012.11.17.08.25.54;	author svnexp;	state Exp;
branches;
next	;

1.38.2.1
date	2012.11.17.08.09.01;	author svnexp;	state Exp;
branches;
next	;

1.38.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.38.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.38.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.38.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.38.12.2;

1.38.12.2
date	2012.11.17.08.17.46;	author svnexp;	state Exp;
branches;
next	;

1.34.8.1
date	2012.11.17.07.46.14;	author svnexp;	state Exp;
branches;
next	;

1.34.20.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.26.2.1
date	2001.04.25.12.09.23;	author ru;	state Exp;
branches;
next	1.26.2.2;

1.26.2.2
date	2012.11.17.07.28.06;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1
date	99.08.29.15.40.24;	author peter;	state Exp;
branches;
next	;

1.7.4.1
date	95.10.06.10.12.53;	author davidg;	state Exp;
branches;
next	1.7.4.2;

1.7.4.2
date	96.07.10.04.15.17;	author jkh;	state Exp;
branches;
next	;

1.1.1.1
date	94.05.26.05.22.26;	author rgrimes;	state Exp;
branches;
next	;


desc
@@


1.42
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249657
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# 	@@(#)Makefile	8.1 (Berkeley) 6/6/93
# $FreeBSD: head/usr.sbin/config/Makefile 249657 2013-04-19 19:45:00Z ed $

PROG=	config
MAN=	config.5 config.8
SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
	mkoptions.c y.tab.h kernconf.c

kernconf.c: kernconf.tmpl
	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c

CFLAGS+= -I. -I${.CURDIR}

NO_WMISSING_VARIABLE_DECLARATIONS=

DPADD=	${LIBL} ${LIBSBUF}
LDADD=	-ll -lsbuf

CLEANFILES+=	kernconf.c

mkmakefile.o: configvers.h

.include <bsd.prog.mk>
@


1.41
log
@Switching exporter and resync
@
text
@d2 1
a2 1
# $FreeBSD: head/usr.sbin/config/Makefile 201390 2010-01-02 11:07:44Z ed $
d14 2
@


1.41.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:14 +0000
@
text
@d1 21
@


1.41.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 22
# 	@@(#)Makefile	8.1 (Berkeley) 6/6/93
# $FreeBSD: releng/8.4/usr.sbin/config/Makefile 179587 2008-06-06 00:01:22Z peter $

PROG=	config
MAN=	config.5 config.8
SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
	mkoptions.c y.tab.h kernconf.c

kernconf.c: kernconf.tmpl
	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c

WARNS?=	6
CFLAGS+= -I. -I${.CURDIR}

DPADD=	${LIBL} ${LIBSBUF}
LDADD=	-ll -lsbuf

CLEANFILES+=	kernconf.c

mkmakefile.o: configvers.h

.include <bsd.prog.mk>
@


1.40
log
@SVN rev 201390 on 2010-01-02 11:07:44Z by ed

The last big commit: let usr.sbin/ use WARNS=6 by default.
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.40.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.40.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/usr.sbin/config/Makefile 201390 2010-01-02 11:07:44Z ed $
@


1.40.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.40.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/usr.sbin/config/Makefile 201390 2010-01-02 11:07:44Z ed $
@


1.40.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.40.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/usr.sbin/config/Makefile 201390 2010-01-02 11:07:44Z ed $
@


1.39
log
@SVN rev 179587 on 2008-06-06 00:01:22Z by peter

Remove versioned property cvs2svn:cvs-rev (test-commit)
@
text
@a11 1
WARNS?=	6
@


1.39.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.39.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/usr.sbin/config/Makefile 179587 2008-06-06 00:01:22Z peter $
@


1.39.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.39.2.1.8.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/usr.sbin/config/Makefile 179587 2008-06-06 00:01:22Z peter $
@


1.39.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.39.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.39.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.38
log
@Fixed "make checkdpadd" (missing library dependencies).

Approved by:	re (kensmith)
@
text
@@


1.38.2.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/usr.sbin/config/Makefile 172401 2007-10-01 18:15:11Z ru $
@


1.38.12.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.38.12.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/usr.sbin/config/Makefile 172401 2007-10-01 18:15:11Z ru $
@


1.38.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.38.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.38.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.37
log
@Add ${.CURDIR} before kernconf.tmpl in order to let the build see newly
added kernconft.tmpl file.

Approved by:	cognet (mentor)
@
text
@d15 1
a15 1
DPADD=	${LIBL}
@


1.36
log
@Improve INCLUDE_CONFIG_FILE support.

This change will let us to have full configuration of a running kernel
available in sysctl:

	sysctl -b kern.conftxt

The same configuration is also contained within the kernel image. It can be
obtained with:

	config -x <kernelfile>

Current functionality lets you to quickly recover kernel configuration, by
simply redirecting output from commands presented above and starting kernel
build procedure. "include" statements are also honored, which means options
and devices from included files are also included.

Please note that comments from configuration files are not preserved by
default. In order to preserve them, you can use -C flag for config(8). This
will bring configuration file and included files literally; however,
redirection to a file no longer works directly.

This commit was followed by discussion, that took place on freebsd-current@@.
For more details, look here:

	http://lists.freebsd.org/pipermail/freebsd-current/2007-March/069994.html
	http://lists.freebsd.org/pipermail/freebsd-current/2007-May/071844.html

Development of this patch took place in Perforce, hierarchy:

	//depot/user/wkoszek/wkoszek_kconftxt/

Support from:	freebsd-current@@ (links above)
Reviewed by:	imp@@
Approved by:	imp@@
@
text
@d10 1
a10 1
	file2c 'char kernconfstr[] = {' ',0};' < kernconf.tmpl > kernconf.c
@


1.35
log
@config.5 was repocopied from share/man/man5/ to usr.sbin/config/.

Repocopied by:	peter
@
text
@d7 4
a10 1
	mkoptions.c y.tab.h
d16 3
a18 1
LDADD=	-ll
@


1.34
log
@Fix a few glitches in my previous commit.
This makes config(8) WARNS?=6 compliant.
@
text
@d5 1
a5 1
MAN=	config.8
@


1.34.8.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/usr.sbin/config/Makefile 129119 2004-05-11 15:42:44Z cognet $
@


1.34.20.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.33
log
@Best we can do is WARNS=1 due to lex.
@
text
@d9 1
a9 1
WARNS?=	1
@


1.32
log
@Do not refer to the non-existant BDECFLAGS.
@
text
@d9 1
@


1.31
log
@Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.30 2001/03/26 14:39:45 ru Exp $
a9 1
CFLAGS+= ${BDECFLAGS}
@


1.30
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.29 2001/03/20 18:16:21 ru Exp $
d5 1
a5 2
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=${BDECFLAGS}
d8 4
a11 1
MAN=	config.8
@


1.29
log
@Set the default manual section for usr.sbin/ to 8.
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.28 2001/02/19 04:43:21 peter Exp $
d9 1
@


1.28
log
@${BDECFLAGS} work.  And fix a real error in the process.  A "MAXUSERS"
string could have been passed to free();  There are some warnings here
I am not sure how to fix as they are in the lex scanner code, etc.
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.27 2000/06/13 22:28:41 peter Exp $
a8 1
MAN8=	config.8
@


1.27
log
@Borrow phk's axe and apply the next stage of config(8)'s evolution.

Use Warner Losh's "hint" driver to decode ascii strings to fill the
resource table at boot time.

config(8) no longer generates an ioconf.c table - ie: the configuration
no longer has to be compiled into the kernel.  You can reconfigure your
isa devices with the likes of this at loader(8) time:
  set hint.ed.0.port=0x320

userconfig will be rewritten to use this style interface one day and will
move to /boot/userconfig.4th or something like that.

It is still possible to statically compile in a set of hints into a kernel
if you do not wish to use loader(8).  See the "hints" directive in GENERIC
as an example.

All device wiring has been moved out of config(8).  There is a set of
helper scripts (see i386/conf/gethints.pl, and the same for alpha and pc98)
that extract the 'at isa? port foo irq bar' from the old files and produces
a hints file.  If you install this file as /boot/device.hints (and update
/boot/defaults/loader.conf - You can do a build/install in sys/boot) then
loader will load it automatically for you.  You can also compile in the
hints directly with:  hints "device.hints"  as well.

There are a few things that I'm not too happy with yet.  Under this scheme,
things like LINT would no longer be useful as "documentation" of settings.
I have renamed this file to 'NOTES' and stored the example hints strings
in it.  However... this is not something that config(8) understands, so
there is a script that extracts the build-specific data from the
documentation file (NOTES) to produce a LINT that can be config'ed and
built.  A stack of man4 pages will need updating. :-/

Also, since there is no longer a difference between 'device' and
'pseudo-device' I collapsed the two together, and the resulting 'device'
takes a 'number of units' for devices that still have it statically
allocated.  eg:  'device fe 4' will compile the fe driver with NFE set
to 4.  You can then set hints for 4 units (0 - 3).  Also note that
'device fe0' will be interpreted as "zero units of 'fe'" which would be
bad, so there is a config warning for this.  This is only needed for
old drivers that still have static limits on numbers of units.
All the statically limited drivers that I could find were marked.

Please exercise EXTREME CAUTION when transitioning!

Moral support by: phk, msmith, dfr, asmodai, imp, and others
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.26 1999/10/10 17:36:09 peter Exp $
d6 1
a6 1
CFLAGS+=-Wall -Wunused -Wmissing-prototypes -Wredundant-decls
@


1.26
log
@Further cleanup.  Also remove the following unused or defunct tokens:
and, bio, cam, master, minor, net, priority, sequential, size, slave, trace
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.25 1999/08/28 01:15:47 peter Exp $
d7 1
a7 1
SRCS=	config.y main.c lang.l mkioconf.c mkmakefile.c mkheaders.c \
@


1.26.2.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/usr.sbin/config/Makefile,v 1.26 1999/10/10 17:36:09 peter Exp $
d9 1
a9 1
MAN=	config.8
@


1.26.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/4/usr.sbin/config/Makefile 75960 2001-04-25 12:11:16Z ru $
@


1.25
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
d6 1
a6 1
#CFLAGS+=-Wall -Wunused -Wmissing-prototypes -Wredundant-decls
@


1.24
log
@Put on my viking helmet from the closet, and get out the war axe and
"retire" some more stuff.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.23 1999/04/18 13:36:28 peter Exp $
@


1.23
log
@Further cleanups.  i386_ioconf.c and alpha_ioconf.c were essentially the
same and were merged into a single newbus_ioconf.c.  CG'd some more unused
code.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.22 1999/04/17 14:41:40 peter Exp $
d8 1
a8 1
	mkoptions.c mkswapconf.c y.tab.h
@


1.22
log
@Get out the blow torch and hack away all the unused stuff.  Note that
I zapped the MACHINE_MIPS stuff, it isn't likely to be useful apart from
recognition of the machine name.  It would be reasonable to expect new
ports would look something like the alpha/i386 from a config perspective.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.21 1999/04/13 18:22:57 peter Exp $
d6 1
@


1.21
log
@Clean up the -g/DEBUG handling.  This logic can go in the Makefile
so that config -g can work the same as:  makeoptions DEBUG="-g"
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.20 1998/05/06 15:27:57 bde Exp $
d6 1
a6 1
SRCS=	config.y main.c lang.l mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
@


1.20
log
@Backed out previous backout.  Put y.tab.h back in SRCS.
@
text
@d2 1
a2 1
#	$Id$
d12 2
a14 2

$(OBJS): configvers.h
@


1.20.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.19
log
@Backed out previous commit.  It was tested, but not for the case where
a separate object tree doesn't exist.  Crufty makefiles will have to
put y.tab.h in SRCS so that we know not to create foo.h from foo.y.
@
text
@d2 1
d6 1
a6 1
SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
a10 3
CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]

y.tab.h: config.c
@


1.18
log
@Fixed races in `make -jN' using new yacc rules.
@
text
@a1 1
#	$Id$
d5 2
a6 2
SRCS=	config.y main.c lang.l mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
	mkoptions.c mkswapconf.c
d10 3
@


1.17
log
@Fixed `make -jN' for large N, as usual.
@
text
@d2 1
d6 2
a7 2
SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
	mkoptions.c mkswapconf.c y.tab.h
a10 3
CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]

y.tab.h: config.c
@


1.16
log
@Style police service brought to you by:	bde
@
text
@d6 1
a6 1
	mkoptions.c mkswapconf.c
d11 2
@


1.15
log
@For safety's sake, explicitly depend all objects on the configvers.h header
to make sure that it's all recompiled even if there is no 'make depend'.
This is overkill, but should be one less thing that someone can do wrong.
@
text
@a10 3
.if defined(CONFIG_NO_CLOBBER_EVER)
CFLAGS+=-DNO_CLOBBER_EVER
.endif
@


1.14
log
@Oops, the previous commit shouldn't have touch the Makefile.
@
text
@d16 2
@


1.13
log
@Don't say that swapping is configured by config.
@
text
@d4 1
a4 1
CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../sys
@


1.12
log
@Backout yacc changes.
@
text
@d4 1
a4 1
CFLAGS+=-I. -I${.CURDIR}
@


1.11
log
@yacc rule changes.
@
text
@d10 1
a10 1
CLEANFILES+= config.c lang.c config.tab.h
@


1.10
log
@Implement support for conf/options and i386/conf/options.i386
Note that this code is dormant unless the options files exist.
Also, parsing of quoted options in the config files is improved.

What this allows, is all the options in LINT to be specified to be
configured as #defines in a file rather than on the CC command line at
kernel build time.  This means that 'make depend' will catch dependencies
on actual *options*, meaning that you can run 'config' and 'make depend'
in complete safety WITHOUT removing the compile directory each time.

Unfortunately, this requires a pass over the source to get the individual
files to #include the new .h files that would be generated by config.
This has a small compile time penalty (appears up to about 2% slower)
from a "fresh" build.  Of course, you should not be needing to do complete
rebuilds very often once this was completed, so it would be an overall
win for most people.

Since this code is dormant and we've got a lot of other things happening
on the kernel tree at the moment (prototypes, devfs, static declarations
etc) I am not planning on doing any changes to activate this feature just
yet.
@
text
@d10 1
a10 1
CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]
@


1.9
log
@If CONFIG_NO_CLOBBER_EVER is defined (e.g., in /etc/make.conf), don't make
it possible for config to ever blow away a work directory.  Default behavior
remains broken.
@
text
@d6 1
a6 1
	mkswapconf.c
@


1.8
log
@Fix CLEANFILES.  Some temporary files were missing.
@
text
@d11 3
@


1.7
log
@Make good on my promise to finally clean up the config clobbering.
If you invoke config with the `-n' flag or have NO_CONFIG_CLOBBER in
your environment, config will behave the same way it used to.  This is
now _documented_ as well.  Rip out all the CONFIG_DONT_CLOBBER cruft;
some of it wasn't even correct anyway.
@
text
@d10 1
a10 1
CLEANFILES+=y.tab.h lang.c config.c y.tab.c
@


1.7.4.1
log
@Sync with main branch.
@
text
@d10 1
a10 1
CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]
@


1.7.4.2
log
@Bring in Garrett's NO_CLOBBER_EVER change and Bruce's disabled keyword handling.
@
text
@a10 3
.if defined(CONFIG_NO_CLOBBER_EVER)
CFLAGS+=-DNO_CLOBBER_EVER
.endif
@


1.6
log
@Remove ifdef for STATCLOCK.  STATCLOCK is standard.
@
text
@a4 3
.if defined(CONFIG_DONT_CLOBBER)
CFLAGS+= -DCONFIG_DONT_CLOBBER
.endif
@


1.5
log
@Revert back to old config behavior if compiled with -DCONFIG_DONT_CLOBBER.
@
text
@d4 1
a4 1
CFLAGS+=-I. -I${.CURDIR} -DSTATCLOCK
@


1.4
log
@Oops...forgot to list the changes....

/usr/src/usr.sbin.config:
	o -DSTATCLOCK gives kludges to support the rtc non-device as well as
	  old kludges to support the clk non-device.

/usr/src/usr.sbin/config.8:
	o Document the trivialness of the new vector.h.

/usr/src/usr.sbin/mkglue.c:
	o Only print DEVICE_NAMES and NR_DEVICES in vector.h.  These are
	  only required to support vmstat.  The vmstat interface will need
	  to be improved for dynamic loading.

/usr/src/usr.sbin/mkioconf.c:
	o Print device ids to be used as indexes into DEVICE_NAMES.
	o Print secondary interrupt handler entry points (xxxintr()) instead
	  of primary ones (VdevU()).  Primary ones are now XintrI() and
	  XfastintrI() and are independent of the config so they are not
	  handled here.
	o Minor cleanups.

Submitted by:	Bruce Evans
@
text
@d5 3
@


1.3
log
@Support for Bruce Evans' new dynamic interrupt support.

Submitted by:	Bruce Evans
@
text
@d1 1
a1 1
#	@@(#)Makefile	8.1 (Berkeley) 6/6/93
@


1.2
log
@Upgrade config to be compatible with our i386 port, pull in 95% of the
changes that have been made in FreeBSD 1.x, except for possibly the nfs
diskless support this is a completed config.
@
text
@d4 1
a4 1
CFLAGS+=-I. -I${.CURDIR}
@


1.1
log
@Initial revision
@
text
@d7 1
a7 1
MAN8=	config.0
@


1.1.1.1
log
@BSD 4.4 Lite usr.sbin Sources
@
text
@@
