svn commit: r207494 - in stable/8/sys: amd64/conf conf
Warner Losh
imp at FreeBSD.org
Sun May 2 06:20:42 UTC 2010
Author: imp
Date: Sun May 2 06:20:42 2010
New Revision: 207494
URL: http://svn.freebsd.org/changeset/base/207494
Log:
Move to the new way of specifying compat options. The backs out the
FOO = BAR form, in favor of listing the mapping in a separate file
for more compatibility with older versions of config.
Modified:
stable/8/sys/amd64/conf/GENERIC
stable/8/sys/conf/Makefile.amd64
stable/8/sys/conf/Makefile.ia64
stable/8/sys/conf/options.amd64
stable/8/sys/conf/options.ia64
Modified: stable/8/sys/amd64/conf/GENERIC
==============================================================================
--- stable/8/sys/amd64/conf/GENERIC Sun May 2 06:18:57 2010 (r207493)
+++ stable/8/sys/amd64/conf/GENERIC Sun May 2 06:20:42 2010 (r207494)
@@ -54,7 +54,8 @@ options PSEUDOFS # Pseudo-filesystem f
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty)
-options COMPAT_FREEBSD32 # Compatible with i386 binaries
+#options COMPAT_FREEBSD32 # Compatible with i386 binaries
+options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
Modified: stable/8/sys/conf/Makefile.amd64
==============================================================================
--- stable/8/sys/conf/Makefile.amd64 Sun May 2 06:18:57 2010 (r207493)
+++ stable/8/sys/conf/Makefile.amd64 Sun May 2 06:20:42 2010 (r207494)
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600009
STD8X16FONT?= iso
Modified: stable/8/sys/conf/Makefile.ia64
==============================================================================
--- stable/8/sys/conf/Makefile.ia64 Sun May 2 06:18:57 2010 (r207493)
+++ stable/8/sys/conf/Makefile.ia64 Sun May 2 06:20:42 2010 (r207494)
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600008
STD8X16FONT?= iso
Modified: stable/8/sys/conf/options.amd64
==============================================================================
--- stable/8/sys/conf/options.amd64 Sun May 2 06:18:57 2010 (r207493)
+++ stable/8/sys/conf/options.amd64 Sun May 2 06:20:42 2010 (r207494)
@@ -11,7 +11,7 @@ MP_WATCHDOG
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
# (see src/sys/conf/options), except for broken debugging options.
-COMPAT_IA32 = COMPAT_FREEBSD32
+COMPAT_IA32 opt_dontuse.h
COMPAT_FREEBSD32 opt_compat.h
#IBCS2 opt_dontuse.h
#COMPAT_LINUX opt_dontuse.h
Modified: stable/8/sys/conf/options.ia64
==============================================================================
--- stable/8/sys/conf/options.ia64 Sun May 2 06:18:57 2010 (r207493)
+++ stable/8/sys/conf/options.ia64 Sun May 2 06:20:42 2010 (r207494)
@@ -9,7 +9,7 @@ LOG2_PAGE_SIZE opt_global.h
UWX_TRACE_ENABLE opt_global.h
-COMPAT_IA32 = COMPAT_FREEBSD32
+COMPAT_IA32 opt_dontuse.h
COMPAT_FREEBSD32 opt_compat.h
EXCEPTION_TRACING opt_xtrace.h
More information about the svn-src-stable
mailing list