From nobody Mon May 02 18:03:35 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 533821AB2EEC; Mon, 2 May 2022 18:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsWDR1pjqz3k1s; Mon, 2 May 2022 18:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651514615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyL3jsAJYo1WHq/q75STh1NhsJU6ep5jjfhCI2jMZEg=; b=k6BAmO79kU+Rafs8HFi3S8rBDoujJ2NI9BXSE9Xk47VD3veTBx4vkovGPDIe+tdFgNpsKl ZbSQcRjYweZH5zKdlqaiiHq7Rexxd2eYAGrrM5405OPNdUFeP0sy3bAZtp2tG1lme4fhh3 25ekVmPwllDdGkCPi+NyK1bsl9BPcR+hzXchd+P/dv0FKEJFufvfJi+l5CumWyY4SUge3+ jXJ6S9hb62wOryFu33nsL6gWUvsPQUa9r+0y9lW6Z7yAg6LXockDG3H7vHzG0gdZRFy/oF 5wGQaV8IEEkPb2Wmf0ddTJGvcI04MqBBzlWu5pG5PW1LVMegnTXQK3Z9PtNO6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EE0A6D1B; Mon, 2 May 2022 18:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 242I3ZbR059778; Mon, 2 May 2022 18:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242I3ZcW059777; Mon, 2 May 2022 18:03:35 GMT (envelope-from git) Date: Mon, 2 May 2022 18:03:35 GMT Message-Id: <202205021803.242I3ZcW059777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b7f53cdcf8d5 - main - Update UNIFIED_OBJDIR descriptions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651514615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyL3jsAJYo1WHq/q75STh1NhsJU6ep5jjfhCI2jMZEg=; b=nlMIiylmDNwpMAg5JoetTVZQ5ie2QzaLkYP/0E8ZcS+Z5Na99YXSghrozDqEC1A0GaNYTl mqcTzY43Mu44zSHk8bMw0koEzwvR8PJUsJ5ZMwC6/PzaH+gGllGUTBqide08wbpvVmDOcU ipv0tN6DKYkr4QYj0Y2ckVnC0TCb/2pBIiTWgs1Bz1F0gi2moCUOO1Puf4f7ivPZWeYYAQ 5qblTVGo0SzKozatriGCTg2MR3BX8RyD0Wp317i9yfGTE0/tZwfwlrv5z8q5vT1bhvo/aF UzW/bDKwDbFSxW9/bGrxLrbaOiOBCidrKSV4jvuXSRYZ2gv3wk8ZcOfIlWsSUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651514615; a=rsa-sha256; cv=none; b=glZbN9OZt8K/zAR9nWs30G4P0N00VeyfjHuxYCP24RkabeKbcKjRvo29Vz4lWkiMVEYJpI Vs5TYVL2tbK+cP4uSiSc5MJ4JcxkmhuAUNU75y5+GasSK1w6b+FmBPTkwNGoE/lRLhVHib C3ZelfbL/Pi3xm/q9Afgt8LWH6AbS9T0Xz8Rs6Jpp4fc72IB+kVPLoZTOcrrRyN/6tFfWu Jh+k4Tu0/2dDXuMP+vmbJcSaM+Gfz7jrUrsdBPoJ/qde4+fiM7RTYsyS65S0bBtqDK9at2 ul9T0BIE3iTEziz8srw2R2yzHl+KbgdqJVm/o4VPkEmr+WsGQZpZB0qjXgvYog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae commit b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae Author: Ed Maste AuthorDate: 2022-05-02 17:53:30 +0000 Commit: Ed Maste 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.