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 ...

[M. Warner Losh]

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?