git: b70e482319de - stable/12 - WITH_OFED build option: fix

[Konstantin Belousov]

The branch stable/12 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=b70e482319de88af072a105f2103ca0c82e84572

commit b70e482319de88af072a105f2103ca0c82e84572
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-02-02 13:01:26 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-02-09 08:36:31 +0000

    WITH_OFED build option: fix
    
    (cherry picked from commit ff975f15d86001d5b948ab538de1e4aca852d2f5)
---
 sys/conf/kern.opts.mk            | 2 +-
 tools/build/options/WITHOUT_OFED | 4 ++++
 tools/build/options/WITH_OFED    | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index c63589ec9db0..e4334ce37237 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -41,6 +41,7 @@ __DEFAULT_YES_OPTIONS = \
     MODULE_DRM \
     MODULE_DRM2 \
     NETGRAPH \
+    OFED \
     PF \
     REPRODUCIBLE_BUILD \
     SCTP_SUPPORT \
@@ -54,7 +55,6 @@ __DEFAULT_NO_OPTIONS = \
     EXTRA_TCP_STACKS \
     KERNEL_RETPOLINE \
     NAND \
-    OFED \
     RATELIMIT
 
 # Some options are totally broken on some architectures. We disable
diff --git a/tools/build/options/WITHOUT_OFED b/tools/build/options/WITHOUT_OFED
new file mode 100644
index 000000000000..18a6943b3580
--- /dev/null
+++ b/tools/build/options/WITHOUT_OFED
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to disable the build of the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack, including kernel modules and userspace libraries.
diff --git a/tools/build/options/WITH_OFED b/tools/build/options/WITH_OFED
deleted file mode 100644
index a995fb8cdab8..000000000000
--- a/tools/build/options/WITH_OFED
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to build the
-.Dq "OpenFabrics Enterprise Distribution"
-Infiniband software stack.