Update UNIFIED_OBJDIR descriptions

src.conf(5) previously stated they would be removed before FreeBSD 12.0,
but that did not happen.  Change it to "a future version of FreeBSD."

Also pick up LOADER_KBOOT change (enabled on x86) in src.conf regen.

Reported by:	jhb
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2022-05-02 13:53:30 -04:00
parent 6f78dae849
commit b7f53cdcf8
3 changed files with 9 additions and 6 deletions

View File

@ -1,6 +1,6 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$
.Dd April 30, 2022
.Dd May 2, 2022
.Dt SRC.CONF 5
.Os
.Sh NAME
@ -992,12 +992,12 @@ amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and r
Do not build kboot, a linuxboot environment loader
.Pp
This is a default setting on
amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf.
arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf.
.It Va WITH_LOADER_KBOOT
Build kboot, a linuxboot environment loader
.Pp
This is a default setting on
powerpc/powerpc64.
amd64/amd64 and powerpc/powerpc64.
.It Va WITHOUT_LOADER_LUA
Do not build LUA bindings for the boot loader.
.Pp
@ -1650,7 +1650,8 @@ while for cross-builds
.Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR}
is used.
.Pp
This option is transitional and will be removed before the 12.0 release,
This option is transitional and will be removed in a future version of
.Fx ,
at which time
.Va WITH_UNIFIED_OBJDIR
will be enabled permanently.

View File

@ -9,7 +9,8 @@ while for cross-builds
.Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR}
is used.
.Pp
This option is transitional and will be removed before the 12.0 release,
This option is transitional and will be removed in a future version of
.Fx ,
at which time
.Va WITH_UNIFIED_OBJDIR
will be enabled permanently.

View File

@ -6,7 +6,8 @@ For cross-builds, native-builds, and sub-directory builds, the format of
.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR}/${TARGET}.${TARGET_ARCH}
is used.
.Pp
This option is transitional and will be removed before the 12.0 release,
This option is transitional and will be removed in a future version of
.Fx ,
at which time
.Va WITH_UNIFIED_OBJDIR
will be enabled permanently.