From nobody Fri Oct 13 19:50:28 2023 X-Original-To: dev-commits-src-main@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 4S6cYc3CB4z4whcl; Fri, 13 Oct 2023 19:50:28 +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 4S6cYc2M0fz4b3w; Fri, 13 Oct 2023 19:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697226628; 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=qRdEIKNwl4IqJ4F8ZpRph766+dw9FRhpZpGDk0gB4VQ=; b=yJ6A48BidW7i/RrvrrubsExUGDRxVDPJNuUUhR0u7hPjvcFaTsT14Qdkl3Th4Whdym76Yr jeMk3PwRx5IIhePzYqcm1zXkUws/pkQCS6f6QUNDDni7fkExiIsrWwJboccFWIwpnnPyX8 0Te2UPcnqSkRhfpdfjNJoOeRQZLJ4TqOsWewGmT9gXZ6XK+q3KHJcaT3sXIA07HyNChcCo +6pSt5xmNlJLJBMmNQCUOwsgvmiOwpp6vEO/toUVjOe2dQ7PsdCFATuz2CuFXGTSU1/llA EF2IEyb25kI4rqKfp4kiQBOCgPVuHsx4c+dJs52RX/At4KgOOOVdCxkUlzVqFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697226628; a=rsa-sha256; cv=none; b=K5YP4MEqGrxFJl4A05OYVMQ0uxt19VQlElsyeN4CrJ1jKmDChspAlVNs/I4B8qj8dHvnj9 yvgkpmd4Z5aChmIIIo1cWSQu4CKQytHA5RzD796lZyBvHJr+4ATdjYFioqHVbz9SBpVpTu w2uOq0fro2Qq1Yy+oMnmlNimIMKXY4nrV3s9aZTBALgwy6g7Ocr4vR/OH5rRAZ61NogFii oFMTklb54ZaJzZ8d4dVrjlvLiCxc131DkR73po8smrjtPFAE0H6VHczz5EZHILKZksHgQH o4sqDA0qCM2gLgBoxqCOyogcbYXJZ0qT/SXERx4SVvz9v7wryld2/9bPgYQgnw== 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=1697226628; 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=qRdEIKNwl4IqJ4F8ZpRph766+dw9FRhpZpGDk0gB4VQ=; b=N0vaNDo5zsGjy4d2wOSPX3z7QK3KtkI30LWTarHLbky5eVVgX48C57lZQS8sro2jAhQ++c yPhKw8ekPXylHndWLhluucaowHpHL91Q1fr82vFbsZ36ZbJsvn/3Ku0nU0VI49iX8xj5la T35HwnqvKmtP1xfn1GjMSPiZPmE7Bis4ERU9PZv9UKZ0EwTluBUn6aCN39RpGUwh0v+0f8 dxWxO4uqxp9JV/BEODwdgR4T+gX8emNw0GRtEg7vk42ifWTKXO9uQjq2HPrEkKKEkrPbZx mFIGd+Tmhjc9tNZ7TwyEz32vax601ggpAhZXm559R+VRqzUSCNCFP19I5xux6g== 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 4S6cYc1QCWz11f2; Fri, 13 Oct 2023 19:50:28 +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 39DJoS08024176; Fri, 13 Oct 2023 19:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DJoSed024173; Fri, 13 Oct 2023 19:50:28 GMT (envelope-from git) Date: Fri, 13 Oct 2023 19:50:28 GMT Message-Id: <202310131950.39DJoSed024173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 922337e8d398 - main - Handle MOVED_LIBS in list-old-files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 922337e8d3989e4f54a0338b7fc397e3e0af7832 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=922337e8d3989e4f54a0338b7fc397e3e0af7832 commit 922337e8d3989e4f54a0338b7fc397e3e0af7832 Author: Ed Maste AuthorDate: 2023-10-13 18:06:58 +0000 Commit: Ed Maste CommitDate: 2023-10-13 19:50:07 +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 MFC after: 3 days Sponsored by: The FreeBSD Foundation Co-authored-by: Dimitry Andric Differential Revision: https://reviews.freebsd.org/D42197 --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7776b40a9801..67dce43e5228 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