From nobody Sat May 07 01:11:50 2022 X-Original-To: dev-commits-src-branches@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 DF3951AD1006; Sat, 7 May 2022 01:11:50 +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 4Kw8Xk5xtfz4Ztr; Sat, 7 May 2022 01:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651885910; 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=cFTeY0icITYxBmH6rLGE4S61KeeU4IfEvE8dOTC0QNM=; b=SvsZ5bIH+Rd87TWOgXoJq6INTjIWqsj+2GWJ8D8PZjlWPJAS5HCxVt2MFkDqbabxheF3ix lgT6bIoE5QliLSCrbYEjIz2vvzuNWIR+symP0t+1zK1J+JeUH9X7f6KP4RKDIp7PSNNB95 mJNS9qzxXdrfE/I6/RyHfYIrac5jmv2PMp+2rB+p7zKod35Osly+QdqaFzcbDJpvSaOaa9 /q7Ee5H1B8YZfqcCscDHY4RNRwK8LTq+RnNp4B22Gu8iJhyBkpHH7UcEsK33NwcGYJYWdl xA0cnu+3XA+UxL40lR2w+yjCdg8rjf3xXM2LKcnA0+qUrttGAjhj2BhtBrzfJg== 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 AB8A6269B4; Sat, 7 May 2022 01:11:50 +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 2471Box5025866; Sat, 7 May 2022 01:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2471Box4025865; Sat, 7 May 2022 01:11:50 GMT (envelope-from git) Date: Sat, 7 May 2022 01:11:50 GMT Message-Id: <202205070111.2471Box4025865@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: 2103ecdad8d0 - stable/13 - Update UNIFIED_OBJDIR descriptions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 2103ecdad8d00f320d0552d9adee65945ed7ac5f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651885910; 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=cFTeY0icITYxBmH6rLGE4S61KeeU4IfEvE8dOTC0QNM=; b=H0GxuqiaME244e9plxsws1+HUoVJmoH9Mp3dYVtoU2uh7OwC/tzOX5XvY1/EbPpmUbqgx7 E9jyqL+w4d/GP64VhdtJQWZscWb6k5vG4Hwuoknxwqb8QRXznVqPiavwclw4Y9heunu5N0 vHbzJzZOlzXSxvPVwKjBs6OCGLm6s9pgld0nfWRIJzeBKyeTdtnncJpBGDaMuldowtm3qS 17v/BRS1nQPpBrQlHh4gwyb+kOxcDxOtiPnedJ0Rni6B6OAp7kqKHjxv65i3eiEBNOmebx lINs37m8nSMPTVDmnME9oDXjLzrcjzhu0nHLpRb5J9ZDwxd66w3HBZ4eEYGF8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651885910; a=rsa-sha256; cv=none; b=cH40tg3V13n+mzpwymktvXhX2Sb7qzbbHCGPfxOdAZmd1fNW+0mWtASix/frzRSuwVv1W8 1ynTFPb8dx6d8hZh5hVO9Flov/o1yqrJfctt5RSkZuKYtvcjJe4kD3K7VoBv+48v3kj3ib Oi35VI/fts9P0n7lQacBitaxw6w7Vrafn5na4sPojJQZX4gSdDw58g6AUSMqZEaafdy/m2 K9dNef671Eftf8FlTu4IVt0cPBAHANN9fXZFBYOwRjTspfxTDxoLn9mT9jHNQd7oRgBHEV 75BfspmZ7mP4SajMYnR0poiRCCcpPlV6e/lctAkk6HOjDo5sXZPw8ooDFqKX5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2103ecdad8d00f320d0552d9adee65945ed7ac5f commit 2103ecdad8d00f320d0552d9adee65945ed7ac5f Author: Ed Maste AuthorDate: 2022-05-02 17:53:30 +0000 Commit: Ed Maste CommitDate: 2022-05-07 01:11:37 +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) --- 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 c1135ebf13c8..7912abde0a98 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 February 8, 2022 +.Dd May 2, 2022 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1664,7 +1664,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 840196941da4..7df78081bb8d 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 2a551e1d9e17..4bc7c6a65904 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.