From nobody Mon Oct 16 12:30:23 2023 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 4S8GfR57L4z4xK1l; Mon, 16 Oct 2023 12:30:23 +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 4S8GfR4f3qz3bl6; Mon, 16 Oct 2023 12:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459423; 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=aD762zxfLF209TJyp8hPPCGo9K+i3PTHbLH5t9CBmrY=; b=r5nO8DZApfwzs0NtF7QFqG7U4aVHsh2HidbmDYuqCNi7EShaFYChROOBiFocMz4pjSVVMh 2uHDDHUxhlK82+s6NbPtN7SAT48r6GtXtSfC9N4yFWdNAT09TbM7iVXdpQ18mm4NFFuUqI oHp6ouEln+SCZrft5goqfIhibvXFo2SV7O/Uj++n62taw8cD75YqcerOvLLRVtff+jvoFs Yt9zaFUfIr2ENfN2+P5XGulVSzMdJjSp+U/Nrjj8/EjVwtpHL9FeSrPGGBW25mAobcN1xa DFKVMIfURC7yfro95SuOGtGrLx1G2xA0sbKcctwNGg349t4A+CU4s8ghn5XxYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697459423; a=rsa-sha256; cv=none; b=deE6TSNsU3KEPXUe1pmuBRyfHQP1uDPlmYxEGdf6UyP2Z2eSgzj4IIiXQczYHM5VQTTYPf y/XvwCKozvu1ZVVJMJ42z05DOMTOzAb95zEhCAnKUdACbJLU1Muwl+MBhTrvE3/oFMkmfb 9hF65c2wO7Rv5B4LKoz8UJ/0yZyaDuViWR6qiNAuzNCwClS4h0rFIiWLuz75cTcmInSis0 lDnakApVUVUc5e5h+JpvSA1I8/bTEtC5fIoIdISN6Stxthku5X517RGfCaJXh7rxo3/pf4 ShwvBpTgHnlIKkSwlhaD5gQtZWItmcn4VP98o5oZTZ8op43v6sQhqnBocCdYHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459423; 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=aD762zxfLF209TJyp8hPPCGo9K+i3PTHbLH5t9CBmrY=; b=K8KD37z7lnJbjwIeRhS4Z3J846w3E2dn+u55DkvfrsK45IrWuvM8smFl3QsRtWq/tUUZKO IWLePnrodpMMIjP1M21s4HDvZsiZp8qE8Fkwq5URjsVN2MRHSj08Bo2cbdCukI8O4LCfyY LqhcBY/qUuo67AsPVn1RCEGGPP3KQADV4Cig2F5Gqse2Y4ou/0BtCOAtFKAQzWRcRsoKzY O+zULT0hgVC15k+B3V1vEifq83LSmvONqchB+6H2s0kkyyyG1tEpI0runK/lH7Drz9o+9q Qy6rAecf3RA0UBnmSrBlgdbYeonxWqmJCUciLiiG7ZInO18FwrASZ8xOPqgpQA== 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 4S8GfR3hKkzgTF; Mon, 16 Oct 2023 12:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GCUNx5079216; Mon, 16 Oct 2023 12:30:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GCUNBx079213; Mon, 16 Oct 2023 12:30:23 GMT (envelope-from git) Date: Mon, 16 Oct 2023 12:30:23 GMT Message-Id: <202310161230.39GCUNBx079213@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: 73099785902d - stable/14 - Handle MOVED_LIBS in list-old-files 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/14 X-Git-Reftype: branch X-Git-Commit: 73099785902d750f96d07f2c413db062bf0e47bd Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73099785902d750f96d07f2c413db062bf0e47bd commit 73099785902d750f96d07f2c413db062bf0e47bd Author: Ed Maste AuthorDate: 2023-10-13 18:06:58 +0000 Commit: Ed Maste CommitDate: 2023-10-16 12:29:46 +0000 Handle MOVED_LIBS in list-old-files MOVED_LIBS is used when a library moves from one directory to another, e.g. /usr/lib/libc++.so.1 to /lib/libc++.so.1. delete-old-files and delete-old-libs are two separate steps, so that old libraries can be retained until third party software packages are rebuilt or reinstalled. Having two copies of the same shared library with the same so version (as can happen when delete-old-libs hasn't been run) causes trouble. The PR below gives one example. Libraries listed in MOVED_LIBS are logically equivalent to updating a library without changing the so version, and should be removed as soon as possible. Handle them in list-old-files and thus delete-old-files. Leave them also in *-old-libs for now, in case the user updates their tree between running delete-old-files and delete-old-libs. PR: 272642 Reviewed by: dim Sponsored by: The FreeBSD Foundation Co-authored-by: Dimitry Andric Differential Revision: https://reviews.freebsd.org/D42197 (cherry picked from commit 922337e8d3989e4f54a0338b7fc397e3e0af7832) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 45d034c0002c..01d3328726bd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3306,6 +3306,7 @@ list-old-files: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \ + -V "MOVED_LIBS:ts\n" \ ${_ALL_libcompats:@v@-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \ sort