Re: install: /usr/libexec/kgdb exists but is not a directory

2024-02-17 Thread Dimitry Andric
On 17 Feb 2024, at 12:15, Dimitry Andric  wrote:
> 
> On 17 Feb 2024, at 01:02, Bjoern A. Zeeb  
> wrote:
>> 
>> 
>> probably related to the 20201215 UPDATING note:
>> 
>> during an update from last year's main to now I hit the following error:
>> 
>> install: /usr/libexec/kgdb exists but is not a directory
>> 
>> Which is true as the old binary was still lingering around.
>> 
>> -r-xr-xr-x  1 root wheel 2833328 11 Aug.  2020 /usr/libexec/kgdb
>> 
>> 
>> UPDATING should probably include that delete-old needs to be run at some
>> point or the binary needs to be removed manually?
> 
> https://cgit.freebsd.org/src/commit/?id=1c0ea326aa6d3 (2020-12-15) removed 
> the files, https://cgit.freebsd.org/src/commit/?id=2524b7dfb0df7 (2024-01-15) 
> added the directory, so that is a window of 4 years!
> 
> That said, it could probably use a workaround like we do for some libc++ 
> files-that-became-directories, in etc/Makefile:

https://cgit.freebsd.org/src/commit/?id=e368e9b75677 :)

-Dimitry




Re: install: /usr/libexec/kgdb exists but is not a directory

2024-02-17 Thread Dimitry Andric
On 17 Feb 2024, at 01:02, Bjoern A. Zeeb  wrote:
> 
> 
> probably related to the 20201215 UPDATING note:
> 
> during an update from last year's main to now I hit the following error:
> 
> install: /usr/libexec/kgdb exists but is not a directory
> 
> Which is true as the old binary was still lingering around.
> 
> -r-xr-xr-x  1 root wheel 2833328 11 Aug.  2020 /usr/libexec/kgdb
> 
> 
> UPDATING should probably include that delete-old needs to be run at some
> point or the binary needs to be removed manually?

https://cgit.freebsd.org/src/commit/?id=1c0ea326aa6d3 (2020-12-15) removed the 
files, https://cgit.freebsd.org/src/commit/?id=2524b7dfb0df7 (2024-01-15) added 
the directory, so that is a window of 4 years!

That said, it could probably use a workaround like we do for some libc++ 
files-that-became-directories, in etc/Makefile:

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 \

-Dimitry