From nobody Mon Oct 16 22:54:09 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 4S8XVB0YKSz4xtxm; Mon, 16 Oct 2023 22:54:10 +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 4S8XVB03MVz4bL2; Mon, 16 Oct 2023 22:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496850; 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=REgP9hII+L5Vk9tPumY9LvZKcAMmKI3lJVMZIW3t1PQ=; b=C/CrsqzDb+mpR26qTo59ctM30HPg2RhPfT0g2Jable270ZHCVyyUvepauMnr2yPKQIwGDW +BOaxBkje8UhspDra4EOkd3wsfBcyqfKWfhUmMdFX2XuvVB1bc5DdeL17xgpHbtCGC1DyC wvq7kFfuohAX7vGw65N16YdSvOKjOjhlNxtPG0NqJ5fyaagvxiQYyb1wKMXgh7IgbBIKYf Gt8QJMo9z9/jLhdzPVjN/Iuaz9NgabQEKn4QijjiTvsO87VnIWNgTmuNf3Y0yTCU9p/1km 88Mn/BggHsvYBmeuEDuL7Iqr+gJ0aGbAsct41OCEBHIrGP/UaocIbgXJCllg7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496850; a=rsa-sha256; cv=none; b=PethUk2xcSh0/TPHGFL1LtZR0YRb5SGXEwkteTh9V+EPBDZ1knZDnAOjTnrrs1jiqU1J4S OHjr0NW9cVrhm3+fXCLsa4YCVE74tg9bx253ydj8ieosFy+N1ntAfQB1GzKR9MKQTPJ1pQ syZjHIvhQ8ykbvf3Zo4ZEVHiAfXwgkVcep1PP6a5p19dZB9s3tj1Xv2k2FNqNT9XpTnSZe 84iEc84OdklhZmVmrHUA4yf0G9T7XGSdXpUVfJJij0OUjN9D7ajCliiW72yd9nCYjMuDaS K7v5p6qk39ofLJk+Y9tH9cupX9pNcPM54NraENFfTX6Vz3vsFA+fBFANdORA2Q== 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=1697496850; 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=REgP9hII+L5Vk9tPumY9LvZKcAMmKI3lJVMZIW3t1PQ=; b=PjS7yudowqUKLACo9/lTRev4ObjtMgmkoF6uahcOiIbSDOyKC5ENHfk17l/3pCIzs3n4I8 aBzHQIQ7pL4nsaYVyBdZwlhuC73B7FKcYoPVEMdjUvwhDORaeOysQdqXTYK0x2m8xE9O+m SW+i76Yml4O5nTXNty63Q1DpJNIbHho2+xsP6lcLwFBAEzYq+hUCtUrJgAc7UjFiCD5K9t xU5ckHiHpeTMWPYgZa6QNag3YYryA2GP76r6kAIasIStcvcstGnWJPSVra5QLr8duLeAql BhUEoeLDOLO3QrZM/EH5LV7QklHD7JV1JdMhKj2hvtM4kQdcm8T1oddoDqfdTQ== 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 4S8XV96CNBzywM; Mon, 16 Oct 2023 22:54:09 +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 39GMs94T029282; Mon, 16 Oct 2023 22:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMs98p029279; Mon, 16 Oct 2023 22:54:09 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:54:09 GMT Message-Id: <202310162254.39GMs98p029279@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: 7bc17b59f802 - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7bc17b59f802d313b72930030e20e664a1c42ea2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc17b59f802d313b72930030e20e664a1c42ea2 commit 7bc17b59f802d313b72930030e20e664a1c42ea2 Author: Ed Maste AuthorDate: 2023-10-13 18:06:58 +0000 Commit: Ed Maste CommitDate: 2023-10-16 22:48:57 +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) (cherry picked from commit 73099785902d750f96d07f2c413db062bf0e47bd) Approved by: re (karels) --- 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