summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-05-02 06:20:42 +0000
committerimp <imp@FreeBSD.org>2010-05-02 06:20:42 +0000
commit01384213a705f4a7e4d5f874b8868b4e8330508f (patch)
tree25273adfb08b9250e4f6162b445fc3880c0056ae /sys/conf
parent56a6fa1b6103a97e72dea2456a399126e07e6b52 (diff)
downloadFreeBSD-src-01384213a705f4a7e4d5f874b8868b4e8330508f.zip
FreeBSD-src-01384213a705f4a7e4d5f874b8868b4e8330508f.tar.gz
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.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.amd642
-rw-r--r--sys/conf/Makefile.ia642
-rw-r--r--sys/conf/options.amd642
-rw-r--r--sys/conf/options.ia642
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 6fe4544..0e64860 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600009
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index f736866..c79dfb9 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600008
STD8X16FONT?= iso
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 4f501f6..54ae095 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -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
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
index cc70feb..4722c62 100644
--- a/sys/conf/options.ia64
+++ b/sys/conf/options.ia64
@@ -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
OpenPOWER on IntegriCloud