From nobody Tue Feb 20 18:25:31 2024 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 4TfSWc1RQVz55N9X; Tue, 20 Feb 2024 18:25:32 +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 4TfSWc0zVGz4Pvj; Tue, 20 Feb 2024 18:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708453532; 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=LANmphCSS3dh+LD5GlKgOVYpp+FlbrrTDUNdI/mH3FU=; b=YZ4NPLO6ysiTlMCu+cj0PflxnIur40vP2l5nmPYpqkbbriG37BcxkII9HBLAudQn1D5eaz crBcgkNFFuMH+J13MBKhBiSlM2acCh3IvJkgjfGX4J0VzmqpJc8Brohjgq2PV8+MhCNi9i xpC+sN/GIYSlKy7lkQ+bEr6PrYN+kc5GVU6Rx0MrGE1oBlfNOWIdaB79JJpGBdBkL+5Z7S MAyfgPlBTgwWd6RNPl16hufpHnRi3P+shdL1FZ08ZAhi/S4N0aN49nem+ASO1DegnAdVWf kWRnTDdRiWdewXRPd2GRXvzIpMiOGQd2FPoXzXTKdlSfZEq813ahTIQrRkohLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708453532; 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=LANmphCSS3dh+LD5GlKgOVYpp+FlbrrTDUNdI/mH3FU=; b=jsuO3TZb+yn5Fpz1WbRNGGoBwmiiYKF+2BKfFsAjEdwB6LNMEofMPaY0P6J9zce0XyuH7M 3iZU8zqG6tDKHDOP8apVPG/DtDkDC6CEXPHPi/Z5qDUYGqzMTurjrlaq7XCUN2fY0kjUea l8lfHeBwXDFKIdqdDNWlN4OCM3RzUgEBzcvB7HjzOl47IudEA2P5jf9fcYSmxm9AqQaDxV Sl/zD6Zezpvf0W4iuxGbC+8dFFub41Dde+6nwzzK5bJSWFgDS5bNQGStk5k3pcREC2qaXV SAIK326UcBgLS5deO7rw9d54o6zr4wOYzfwtlmlw9ytcVJ5UbM/L4N2D/od0AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708453532; a=rsa-sha256; cv=none; b=kG/PC5gQkFvcj90Abi+bc7hgt/yynGgAGalXDbqxPe2YCUYBdvfItTDCP6yhjXhUpeI6AR xTPvEIOejnJQfIdr82DGyfmXPD9KD9g3u8o67Wrbdo/TbUYatRVJpiHYXKunoFKFMO4hkF bu7LpCdVPEgP9wi6NlKDbVDGx9vjlwcy+GPOg5rM+z7E1mKDtz1aRlM3bF7bmGb2FeXRTt tTQGT2TqAkVLJ0NOYKQsa6Yep6SrWC8fKdOq+yhPSF1QpAV11dsW0oC6LmUyeN5Cn38E/y YH6n6yH308LuPIInHhi5j3OyA3XzYS2QapqIYYM/CV26AcUPnGcJyg2HUoSutA== 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 4TfSWc02sgzTll; Tue, 20 Feb 2024 18:25:32 +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 41KIPVdJ092444; Tue, 20 Feb 2024 18:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KIPVtj092441; Tue, 20 Feb 2024 18:25:31 GMT (envelope-from git) Date: Tue, 20 Feb 2024 18:25:31 GMT Message-Id: <202402201825.41KIPVtj092441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f96dd1e361f8 - stable/13 - Proactively remove /usr/lib/kgdb file that became a directory 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f96dd1e361f8e452a31b9928d1c0959eb6be6f27 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f96dd1e361f8e452a31b9928d1c0959eb6be6f27 commit f96dd1e361f8e452a31b9928d1c0959eb6be6f27 Author: Dimitry Andric AuthorDate: 2024-02-17 11:27:33 +0000 Commit: Dimitry Andric CommitDate: 2024-02-20 18:22:57 +0000 Proactively remove /usr/lib/kgdb file that became a directory This was already handled in ObsoleteFiles.inc (see the 20201215 entry), but some people never run "make delete-old", or want to upgrade directly from a revision that still had the file to the most recent revision. They would then encounter a failure during installworld, similar to: install: /usr/libexec/kgdb exists but is not a directory Therefore, clean it up in the distrib-cleanup phase, similar to the earlier instances of libc++ header files that became a directory. MFC after: 3 days (cherry picked from commit e368e9b756772264acdbc11f3cc1d223bcd48dee) --- etc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/Makefile b/etc/Makefile index 9b4b7c93d10a..05632e8ce710 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -125,6 +125,7 @@ MTREES+= ../${mtree} / # scenario. DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__string DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__tuple +DISTRIB_CLEANUP_FILES+= ${LIBEXECDIR}/kgdb distrib-cleanup: .PHONY for file in ${DISTRIB_CLEANUP_FILES}; do \ if [ -f ${DESTDIR}/$${file} ]; then \