git: db43cefe080f - stable/14 - Proactively remove /usr/lib/kgdb file that became a directory
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Feb 2024 18:23:34 UTC
The branch stable/14 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=db43cefe080f7da93c5be1173b526855df65f6b1
commit db43cefe080f7da93c5be1173b526855df65f6b1
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-02-17 11:27:33 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
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 \