From owner-cvs-src-old@FreeBSD.ORG Tue Apr 27 05:04:48 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 371EC1065740 for ; Tue, 27 Apr 2010 05:04:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23FA08FC16 for ; Tue, 27 Apr 2010 05:04:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3R54mMF056458 for ; Tue, 27 Apr 2010 05:04:48 GMT (envelope-from imp@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3R54mQg056457 for cvs-src-old@freebsd.org; Tue, 27 Apr 2010 05:04:48 GMT (envelope-from imp@repoman.freebsd.org) Message-Id: <201004270504.o3R54mQg056457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to imp@repoman.freebsd.org using -f From: Warner Losh Date: Tue, 27 Apr 2010 05:04:32 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.sbin/config config.h main.c mkmakefile.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2010 05:04:48 -0000 imp 2010-04-27 05:04:32 UTC FreeBSD src repository Modified files: usr.sbin/config config.h main.c mkmakefile.c Log: SVN rev 207260 on 2010-04-27 05:04:32Z by imp Move checking the version up from Makefile generation to just after we've parsed the config file. Makefile generation is too late if we've introduce changes to the syntax of the metafiles to warn about version skew, since we have to try to parse them and we get an parse error that's rather baffling to the user rather than a 'your config is too old, upgrade' which we should get. We have to defer doing it until after we've read the user's config file because we define machinename there. The version required to compile the kernel is encoded in Makefile.machinename. There's no real reason for this to be the case, but changing it now would introduce some logistical issues that I'd rather avoid for the moment. I intend to revisit this if we're still using config in FreeBSD 10. This also means that we cannot introduce any config metafile changes that result in a syntax error or other error for the user until 9.0 is released. Otherwise, we break the upgrade path, or at least reduce the usefulness of the error messages we generate. # This implies that the config file option mapping will need to be redone. MFC after: 3 days Revision Changes Path 1.65 +1 -0 src/usr.sbin/config/config.h 1.83 +40 -0 src/usr.sbin/config/main.c 1.98 +21 -24 src/usr.sbin/config/mkmakefile.c