Date: Mon, 2 May 2022 18:03:35 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b7f53cdcf8d5 - main - Update UNIFIED_OBJDIR descriptions Message-ID: <202205021803.242I3ZcW059777@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae commit b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-05-02 17:53:30 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-05-02 18:02:31 +0000 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 --- share/man/man5/src.conf.5 | 9 +++++---- tools/build/options/WITHOUT_UNIFIED_OBJDIR | 3 ++- tools/build/options/WITH_UNIFIED_OBJDIR | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 7c5ca11170c5..2b7f52d8dcd8 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -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. diff --git a/tools/build/options/WITHOUT_UNIFIED_OBJDIR b/tools/build/options/WITHOUT_UNIFIED_OBJDIR index a76e30ca4123..c20a96aeaea3 100644 --- a/tools/build/options/WITHOUT_UNIFIED_OBJDIR +++ b/tools/build/options/WITHOUT_UNIFIED_OBJDIR @@ -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. diff --git a/tools/build/options/WITH_UNIFIED_OBJDIR b/tools/build/options/WITH_UNIFIED_OBJDIR index b3d245121ea3..8fe8229c597c 100644 --- a/tools/build/options/WITH_UNIFIED_OBJDIR +++ b/tools/build/options/WITH_UNIFIED_OBJDIR @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205021803.242I3ZcW059777>