Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Feb 2024 11:31:09 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: e368e9b75677 - main - Proactively remove /usr/lib/kgdb file that became a directory
Message-ID:  <202402171131.41HBV9wg005572@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=e368e9b756772264acdbc11f3cc1d223bcd48dee

commit e368e9b756772264acdbc11f3cc1d223bcd48dee
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-02-17 11:27:33 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-02-17 11:27:33 +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
---
 etc/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/Makefile b/etc/Makefile
index 745ca91c60bf..229d9380901d 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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402171131.41HBV9wg005572>