Revert config(8) version bump. It brings major pain for people working on

different versions of FreeBSD source tree.

Old config(8) can now be used unless you want to use INCLUDE_CONFIG_FILE
option.

Approved by:	imp
Reviewed by:	imp

9 files changed, 17 insertions, 8 deletions

diff --git a/UPDATING b/UPDATING
index 6c58f6fabeb7..47cb554de341 100644
--- a/UPDATING
+++ b/UPDATING
@@ -21,6 +21,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW:
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070516:
+	Improved INCLUDE_CONFIG_FILE support has been introduced to the
+	config(8) utility. In order to take advantage of this new
+	functionality, you are expected to recompile and install
+	src/usr.sbin/config. If you don't rebuild config(8), and your
+	kernel configuration depends on INCLUDE_CONFIG_FILE, the kernel
+	build will be broken because of a missing "kernconfstring"
+	symbol.
+
 20070513:
 	Symbol versioning is enabled by default.  To disable it, use
 	option WITHOUT_SYMVER.  It is not advisable to attempt to
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 3b8e4f3014a0..1032a51ac334 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 2ba7f7df0aac..10a98828ccc4 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 # Temporary stuff while we're still embryonic
 NO_MODULES=
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 181c1a949b33..f8a8365c448e 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 6ac5a4a03ac9..2139b172cafa 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -19,7 +19,7 @@
 GCC3=	you bet
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 7019b849b8fa..18ee498bcf3a 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 .if !defined(S)
 .if exists(./@/.)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 0ad017eb8eb3..81b1bb483359 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 7fcde6bb7c8f..947ec87ace50 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.sun4v b/sys/conf/Makefile.sun4v
index 7fcde6bb7c8f..947ec87ace50 100644
--- a/sys/conf/Makefile.sun4v
+++ b/sys/conf/Makefile.sun4v
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600006
+%VERSREQ=	600004
 
 STD8X16FONT?=	iso