From nobody Sat Aug 5 06:02:40 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 4RHsSJ2qXrz4phDL; Sat, 5 Aug 2023 06:02:40 +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 4RHsSJ24Bkz4XnB; Sat, 5 Aug 2023 06:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691215360; 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=I8R1YxunGpJSth1K1UlEqd3aQiDo14/6a7SDkJl+dRI=; b=iadj7w4vTjaRbsAWZeqP1di/q0oR3ll3DtHxzIndb83jMTZXxEQPRu4DNTQKVtsd29K9zD tbzpSz9umxdoPSVmJyoiAFzOz4ho+deyhxv2hA00TsyiLiaIdZVTlO/oRWL0wv1wLdPMcM NgOcoZn8DICnjp3XmYEGH4Vr3NzyqrBB0vtRBTqMrW8ONd0Z0XWWpQ5Sh+Tv54M/Q2b0tc hxLgqHcXHnB/m+VTV/F9bTAVZqCI3prZpba9G20y9JTrnaXlteUSbkt1rKTNjP4scATJYy gA8+68NJlTJkXJ9vi2sR9SSG2P6lpeNM12PRK6fM8JlvG5psNActkNV/Tu/QLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691215360; 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=I8R1YxunGpJSth1K1UlEqd3aQiDo14/6a7SDkJl+dRI=; b=sJzvXYEDG3Kjs1KVB8FT/9QQViTUvmY8UKNacqfZhZBQWzH7nwf8WUaS1VZE0/E8c2q7w/ 8LalMG/vwG9/GZDBAi/WaAd31vd+zWfkMEj3zrEC/GM5v2NBcHFUBBeRdKhC4TPmKp+vol e2VOa+H1BoAhS+BrkfcMgFPxrZRxZj6Yxa70M2Zip531GhIlWtc+xFQvNrIbCykdT9FSYg 4nKwHHQQ9g4PwDPxTqIw3K6WEe5jPfg+0BZnpQ80nOsRlJNi5t8jL+qHS+jIBYvAAMtAaF mpfWM+o96UxFEGl9pIXowoQLmZM8vxh2TpBsCm6eCuKuUDCRRW1ezSFCPWXbcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691215360; a=rsa-sha256; cv=none; b=ter5TrdaqWo+8aE5rp7k/w3Kxdn6xRNFycenLVkLOAUGksb1d6Av9165sNse/iOu0eCXS4 0p5JKw8dAFQepW4DSF1TFA2I5LMQKUgKP0IqJkVnYY20frfUShB/Q8SlaHWZ9tyJubffdU E/V8qhpe3FCEm/+Ai+PZyE3cQ9VW+P6O3HDfjhtTEp582ovmz0wqERmvkYtWcKFe2Vrg/A nxDnyf3XfNmozDFGBJv2Vw9q8ozLnT5nvfrqYJw+oVQbSnZH/3q9fOa9z8KQKZJqstTA9b BAaQ9A5NQVzm01b05YBIfYdnd1nx+u4SLuo9BX7nCZQNLfsgZCCM+iWj01ZAnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHsSJ16yGz3gT; Sat, 5 Aug 2023 06:02:40 +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 37562eoI093442; Sat, 5 Aug 2023 06:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37562e7L093441; Sat, 5 Aug 2023 06:02:40 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:02:40 GMT Message-Id: <202308050602.37562e7L093441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 995d2b3e3bcf - main - ObsoleteFiles.inc: Don't try and delete /usr/lib32/libdtrace.so.2 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 995d2b3e3bcf69a0d705e41c98b1cb85c7a6316b Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=995d2b3e3bcf69a0d705e41c98b1cb85c7a6316b commit 995d2b3e3bcf69a0d705e41c98b1cb85c7a6316b Author: Jessica Clarke AuthorDate: 2023-08-05 06:02:27 +0000 Commit: Jessica Clarke CommitDate: 2023-08-05 06:02:27 +0000 ObsoleteFiles.inc: Don't try and delete /usr/lib32/libdtrace.so.2 OLD_FILES and OLD_LIBS implicitly include the libcompat variant, whereas MOVED_LIBS exists specifically for files that have moved between /lib and /usr/lib, and thus don't get a libcompat equivalent. Reported by: des Fixes: 5fd1da4d8501 ("ObsoleteFiles.inc: Add an entry for libdtrace.so.2 in /usr/lib") --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 67bdb1f3d8e0..d77ced3c817d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -56,7 +56,7 @@ OLD_FILES+=usr/include/net/iflib_private.h # 20230802: Remove a copy of libdtrace.so installed to the wrong path -OLD_FILES+=usr/lib/libdtrace.so.2 +MOVED_LIBS+=usr/lib/libdtrace.so.2 # 20230726: Removal of support for the VTOC8 partitioning scheme OLD_FILES+=usr/include/sys/disk/vtoc.h