From owner-cvs-all@FreeBSD.ORG  Sun Nov 27 22:33:40 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8E9D916A422;
	Sun, 27 Nov 2005 22:33:40 +0000 (GMT) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F2B4743D60;
	Sun, 27 Nov 2005 22:33:38 +0000 (GMT) (envelope-from imp@bsdimp.com)
Received: from localhost (localhost.village.org [127.0.0.1] (may be forged))
	by harmony.bsdimp.com (8.13.3/8.13.3) with ESMTP id jARMWLur052198;
	Sun, 27 Nov 2005 15:32:21 -0700 (MST) (envelope-from imp@bsdimp.com)
Date: Sun, 27 Nov 2005 15:32:39 -0700 (MST)
Message-Id: <20051127.153239.85325290.imp@bsdimp.com>
To: ru@FreeBSD.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <200511272141.jARLfwca016783@repoman.freebsd.org>
References: <200511272141.jARLfwca016783@repoman.freebsd.org>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(harmony.bsdimp.com [127.0.0.1]);
	Sun, 27 Nov 2005 15:32:21 -0700 (MST)
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/usr.sbin/config configvers.h mkmakefile.c
 src/sys/conf Makefile.alpha Makefile.amd64 Makefile.arm Makefile.i386
 Makefile.ia64 Makefile.pc98 Makefile.powerpc Makefile.sparc64 files
 files.alpha files.amd64 files.i386 ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Nov 2005 22:33:40 -0000

More specificly, I'd like to apply the following patch (+ fix the
%VERSREQ in the src/sys/conf/Makefile.*):

Index: configvers.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/configvers.h,v
retrieving revision 1.41
diff -u -r1.41 configvers.h
--- configvers.h	27 Nov 2005 21:41:57 -0000	1.41
+++ configvers.h	27 Nov 2005 22:31:10 -0000
@@ -27,7 +27,8 @@
  *
  * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.41 2005/11/27 21:41:57 ru Exp $
  */
-#define	CONFIGVERS	700000
+#define MAJOR_VERS(x)	((x) / 100000)
+#define	CONFIGVERS	600003
 
 /*
  * Examples of when there should NOT be a bump:
Index: mkmakefile.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/config/mkmakefile.c,v
retrieving revision 1.83
diff -u -r1.83 mkmakefile.c
--- mkmakefile.c	27 Nov 2005 21:41:57 -0000	1.83
+++ mkmakefile.c	27 Nov 2005 22:31:10 -0000
@@ -160,7 +160,8 @@
 			do_clean(ofp);
 		else if (strncmp(line, "%VERSREQ=", sizeof("%VERSREQ=") - 1) == 0) {
 			versreq = atoi(line + sizeof("%VERSREQ=") - 1);
-			if (versreq != CONFIGVERS) {
+			if (MAJOR_VERS(versreq) != MAJOR_VERS(CONFIGVERS) ||
+			    versreq > CONFIGVERS) {
 				fprintf(stderr, "ERROR: version of config(8) does not match kernel!\n");
 				fprintf(stderr, "config version = %d, ", CONFIGVERS);
 				fprintf(stderr, "version required = %d\n\n", versreq);

Comments?