From nobody Sat May 7 01:12:21 2022 X-Original-To: dev-commits-src-all@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 A6D1A1AD13CA; Sat, 7 May 2022 01:12:21 +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 4Kw8YK2fDRz4bSr; Sat, 7 May 2022 01:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651885941; 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=frfVXxraQNF128L//jqrd/FuYQAplkxLcXMkC7o/3u8=; b=CI3eLg3GuKxs6JInvYA2h3VyVa1jr4xYludtA/l6/KwBQgfu/ntohXr2mlSmUZk/Yy2laN ekExhVQH18DJMDHirmUE/vp0b8xP+asMDleBwVMMXuwj7op2RU0o1KhKFs4Zc+BrFFY51b e5HUDO9LWWKFloxPOOXsplpTm1915z0agjDndZS1eS+DFKZW1gFxc33kIbTyBwtdycZEHk RZwrioTPltUsiqMyWiGdT9EJg83HLiSo2yAa+jC7V+phk3zgiBMBJK7kXkrX6mwE7RzKpF jCVvkfTfp7BgNZQFoyqP5flQog0dN3ckkphgNKVoTPJ9SdUQuJPz8qWC/Na6wg== 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 3264526B0E; Sat, 7 May 2022 01:12:21 +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 2471CLdp026006; Sat, 7 May 2022 01:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2471CLxM026004; Sat, 7 May 2022 01:12:21 GMT (envelope-from git) Date: Sat, 7 May 2022 01:12:21 GMT Message-Id: <202205070112.2471CLxM026004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7bf8bd9de347 - stable/12 - Update UNIFIED_OBJDIR descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 7bf8bd9de347146e12ae2d7a4529637228e69b67 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651885941; 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=frfVXxraQNF128L//jqrd/FuYQAplkxLcXMkC7o/3u8=; b=wwIo2naxeKft8oRfaliJQMDyawcldutLuNRZMMGg3GEODyXMc3m6O+Ej1pIbtOSSDhHUbE nIZCUGIGD/1kNOSuJ98tv7EqNkiF7kR6+dZFS5G78yRPzRcn2MrFYKRJ69oO9efdhJLUtp QWVXQysGuZfd0EyN+SbvTqpYMV67pmxfhz429CVNnRbnr5RsTxFixHRwBnT2wZ5WtiD2ob 1yD6ePbFyVWQWe8XLCiZHr7V+a/0fo1FU1DmPRBWy307SpwLRGtaAf/7O4HHubdOcG4R00 1bOKfsvQyDz+F10e2qF+gubx40FqXdkgXm8eVLHHbnZMt0YCGqvWqjhMGL6qPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651885941; a=rsa-sha256; cv=none; b=GjZIifusQJB1dHqn41nP38ljmbbOjQqqnzVlaKFGAhGUdlvxvGl/oexgCg2n9wa4M/G2lI hXF/ALYjKeNHIg5tt1nF0kNP1Hl3yu1VpXPcv5shp/L7MhJH5OYCLMMGD9X+RmmMcFYI+g G85g8dM+KzYUw9ew5kC3w3R4TN0p3mrmwIoHouxHxxsGmh781JBZ7kX0x5q9rv/kRGSvcX tMqKMPrLFY7Bsifbx4jTdX+pZtzAEnGTz/bSIv/ZI5piWJodtmXUCIuItSp/vmyec9NUkv Rg7qNAG1Xw57+Wcmab1GZr82gZm60BMMzj4bniWKemE2x4BvLBgax0a2u8sYMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf8bd9de347146e12ae2d7a4529637228e69b67 commit 7bf8bd9de347146e12ae2d7a4529637228e69b67 Author: Ed Maste AuthorDate: 2022-05-02 17:53:30 +0000 Commit: Ed Maste CommitDate: 2022-05-07 01:12:06 +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 (cherry picked from commit b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae) (cherry picked from commit 2103ecdad8d00f320d0552d9adee65945ed7ac5f) --- share/man/man5/src.conf.5 | 5 +++-- tools/build/options/WITHOUT_UNIFIED_OBJDIR | 3 ++- tools/build/options/WITH_UNIFIED_OBJDIR | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 606e61a4e9c4..d3af8e62fbda 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 June 28, 2021 +.Dd May 2, 2022 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1947,7 +1947,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 355730c4a17e..7683f0058f59 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 6efc01d09c5e..2bded8d521bb 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.