diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2024-02-17 11:27:33 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-02-20 18:22:06 +0000 |
| commit | db43cefe080f7da93c5be1173b526855df65f6b1 (patch) | |
| tree | 3f4275f374edd5f7cbff25b5c94677da2f16bcc6 | |
| parent | c8c5d91f48c4e4496fb2554489198a8817656e1e (diff) | |
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)
| -rw-r--r-- | etc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
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 \ |