From nobody Wed Jul 13 16:06:38 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 A7E811D0C965; Wed, 13 Jul 2022 16:06:38 +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 4LjjDG2GsCz3PjP; Wed, 13 Jul 2022 16:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657728398; 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=P5JmHi5WyyHtXb8QDsD0IFNebWG1MY8HkRXHNWsT4N0=; b=G5f9/sDQVNYMXDwcxdvqb94xvPVC9QhCNQPmWexl/ySNsk7nmrgptIc1NoOTRG3xtu+HVs b73+d3uER9Kf0ciKk18NBm8OtiTtq/my3SReKjzG2F9r8jFagAC/gB7wuzctYQv/azHyzz np8Bpx40skHrn3vCL1NMmTbuXYvaO3XC7/1c5wNgaSbjR31Wt9KkzYA/3FrcNStFJQ+QJZ LTMf8o9jfOHx6Q/ZJ/3boWxvXKH99LN8xBIqIPA4qLHn8NKG9noujKUwgABKcjBbz1VMMO ZuifsQDJ5pX9eePcEZzBuoQVrlptnkppuakZY8h161U4mhmT4xMMZhtGy7QLcA== 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 4LjjDG1Dy4zTQy; Wed, 13 Jul 2022 16:06:38 +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 26DG6caI097761; Wed, 13 Jul 2022 16:06:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DG6c0c097760; Wed, 13 Jul 2022 16:06:38 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:06:38 GMT Message-Id: <202207131606.26DG6c0c097760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7344bc6cb7b4 - stable/13 - Rework documentation of OLD_*. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7344bc6cb7b45874bac85df67dd663cd5ffd81de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657728398; 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=P5JmHi5WyyHtXb8QDsD0IFNebWG1MY8HkRXHNWsT4N0=; b=ejQX5dMIEjK4NTb4/9p8VxfjtDB9+MystplxMIcreiO8RtXXvI4RUyTIOD7KeKqJL9rS8m JC3RLp7rBNRSncofsQDQ15xy5iyNXIdS/yhaepwu/Mx1ofDBBOoIDhypD0GKBEd3ZFwEvy EgjD7wvKiVnlH0nT1bP2DIuPfTigbD5ms4JUp4euhxqA+DQF0T8+5JIkgs79R+MKIDe5S8 naq4NUpJUTVtS1OTFkWaoHlgYnR8bQGTxcBqUdo5cusXPwcCy3MLofB39RpTXWKNmocaup T8KbBPtlL3e697NNq956S/PHhnlH+j07mcAamPERrrMOJ/u8bJtnFWrL7w1e9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657728398; a=rsa-sha256; cv=none; b=y39InIHbPDsRm/nqmgiPoSNUoOlVE3yziiSBXB7VP2+EUPNR/Q28rfTo9pkTkZdkc4I9RD pxbMrswsU+rE24Xvyfa4bRfiVvS3qCPzsMG5xac0qT2k+mFqQp/PTapW/XfQw32/EOY65j zgNFnvCRGwHj6XHbrtgdKdM/029EJtxq3t8o5SLhephHZY8LIltBy+xPEtYoVARmylW31n nvHch6GOuQoTfwNul1faPmf1OGp6/hRKRR3uul85BabDsOqSnCIeHwhJY3tMTjuKhlCBLV XlytiuDe34Aignsi6OhVfBLJNqSkuYLEYnpJhhD1pQOPIt2lEy1sz/OiWwzD2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7344bc6cb7b45874bac85df67dd663cd5ffd81de commit 7344bc6cb7b45874bac85df67dd663cd5ffd81de Author: John Baldwin AuthorDate: 2022-01-20 20:46:29 +0000 Commit: John Baldwin CommitDate: 2022-07-13 15:34:26 +0000 Rework documentation of OLD_*. - Be more explicit in the difference between OLD_DIRS and OLD_FILES (the former is only in delete-old-libs whereas the latter is in delete-old). - Document that debug symbols in /usr/lib/debug/ for files in OLD_FILES and OLD_LIBS are removed as well. Reviewed by: emaste Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33847 (cherry picked from commit c96dfb2156fa8a83dd225d1a9b31070123469288) --- ObsoleteFiles.inc | 19 +++++++++++++------ tools/build/mk/OptionalObsoleteFiles.inc | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 840aa8743dba..11269e9358b9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -2,17 +2,24 @@ # $FreeBSD$ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and -# directories (OLD_DIRS) which should get removed at an update. Recently -# removed entries first (with the date as a comment). Dynamic libraries are -# special cased (OLD_LIBS). Static libraries or the generic links to -# the dynamic libraries (lib*.so) should (if you don't know why to make an -# exception, make this a "must") be viewed as normal files (OLD_FILES). +# directories (OLD_DIRS) which should get removed after an update. +# Recently removed entries should be listed first (with the date as a +# comment). OLD_LIBS should only list dynamic libraries. Static libraries, +# links to dynamic libraries (lib*.so), and linker scripts should be listed +# in OLD_FILES. OLD_LIBS are removed by the delete-old-libs target, whereas +# OLD_FILES and OLD_DIRS are removed by the delete-old target. This +# separation allows users to avoid deleting old dynamic libraries still +# required by existing binaries. +# +# For files listed in OLD_FILES and OLD_LIBS, the check-old* and +# delete-old* targets will also delete associated debug symbols from +# usr/lib/debug. # # In case of a complete directory hierarchy the sorting is in depth first # order. # # Files that are installed or removed depending on some build option -# are to be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc +# should be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc # instead of in this file. # # Before you commit changes to this file please check if any entries in diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d7cdbec9cb87..fb5eed3fffbc 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1,8 +1,8 @@ # # $FreeBSD$ # -# This file add support for the WITHOUT_* and WITH_* knobs in src.conf(5) to -# the check-old and delete-old* targets. +# This file adds support for the WITHOUT_* and WITH_* knobs in src.conf(5) to +# the check-old* and delete-old* targets. # .if ${MK_ACCT} == no