From nobody Tue Feb 20 18:23:34 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 4TfSTL49HXz55N14; Tue, 20 Feb 2024 18:23:34 +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 4TfSTL3G4Jz4PdP; Tue, 20 Feb 2024 18:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708453414; 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=UOdVJrEAVHXnVIipKyv9cXk+XIu6rlU2N3Q8X89y6M4=; b=BntOZBPMaFp96R2B8P5BGNZ5M8hYaYRcHGgtaAgfYDvTwjX7ABYzVYjx5NOTCszKyUmYcg v7o/Kmt/YidGh4KLGx3yyo6d9zjseiPR5AGlnPxWt03y3mk0OfRVIsOLsp8JxOI3QSH5bz 4AcFpXcTKFTbD7+rDi1ZkGTqF1dIrnzuKre+yOHbhUMPaWlsqOuTDXoGVwAycXMkxwDEDA Y1xuZasDv5FISa2C4J5pCAzxhKr578eq93mmjT0Je4UKT/bqEtC2/WVyw8u1hg9gjZFAuv MPCq9WSmZliZI4cng0BGJsxJ8HnpynqUf3aSnFxf0VANSKMLcGWXqb4a4iOeAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708453414; 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=UOdVJrEAVHXnVIipKyv9cXk+XIu6rlU2N3Q8X89y6M4=; b=kU6R5fPJ4PFb2qgAOgQqvulQQbs3mtrc4BwFROoyNzfpFhDYPxicMYj5OmzqchwjbhEWD1 yivBJaNRHwqrXOb6IL8B5nL1b6yum3pFReC42puydtuwfNNSKmeyWtGQOZdCQS8p7E+2RM LN+hVCc9nejNqSJpG+//0ytoJgRTOyZv4gxv5dFEh8Bw7hMh/hOOxCK7GtPH3nhRL5xidM dw+vC3vlzNZ5iwFBLQ5ZwPB4C0Lyf1GGFQwBrDrumUofPHO1ZVSp2amAU9TKPcUyCHgomv KiL41d/H+jSze72QPxRPRL3h+W6Ueyzq3eAtqM2CoNlJ0/GB4N2yOCh+5GUECw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708453414; a=rsa-sha256; cv=none; b=VYNfdJnCDyaiYS1Yr2xZSB3fRs0hRR+wdXnCVp81a8CEaeCQCsbTk9KOzpFNX1u0Et7niq N8w+IjhVmR4uWpYdz3EvEJbhEFiQHMhsLP53vRBIp9IOWd7xC6yQ3xHr7VeeTa6O9myl9+ KEfzNS7aY3UzvLuyovXda/7+6lm7cdrNAVKr4sc8pGptMm1aaZ/6p1BohMWFhCnY7o8bkk mPr5WUjBDvWGwb+R92SgjtYTg9hMl0vaBdYKlss9Ya9sHkz2A5+S2MBA8NSPr6bkut0q3a uqW7R3YaV96+rBRwbv7WhAnN3URYXZ6NAgG5AZu08r6XYJV4zlbcizQqFTofNQ== 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 4TfSTL2Kc1zT9s; Tue, 20 Feb 2024 18:23:34 +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 41KINYw4092049; Tue, 20 Feb 2024 18:23:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KINYDc092046; Tue, 20 Feb 2024 18:23:34 GMT (envelope-from git) Date: Tue, 20 Feb 2024 18:23:34 GMT Message-Id: <202402201823.41KINYDc092046@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: db43cefe080f - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: db43cefe080f7da93c5be1173b526855df65f6b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=db43cefe080f7da93c5be1173b526855df65f6b1 commit db43cefe080f7da93c5be1173b526855df65f6b1 Author: Dimitry Andric AuthorDate: 2024-02-17 11:27:33 +0000 Commit: Dimitry Andric CommitDate: 2024-02-20 18:22:06 +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 057bfe4fa7e7..a680572f66bf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -126,6 +126,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 \