./mkkern fails on OpenBSD 6.1

[SteveClement]

It seems something has changed in the kernel build directory on OpenBSD 6.1

ls -lisa /usr/src/sys/arch/i386/compile/FLASHRD
total 12
113237 4 drwxr-xr-x  2 root   wsrc  512 Apr 13 10:31 ./
 80879 4 drwxr-xr-x  9 root   wsrc  512 Apr 13 10:31 ../
113238 4 -rw-r--r--  1 root   wsrc   27 Apr 13 10:31 Makefile
113239 0 lrwxrwx---  1 build  wobj   38 Apr 13 10:31 obj@ -> /usr/obj/sys/arch/i386/compile/FLASHRD

Editting "mkkern" and adding "obj/" before "bsd" (where we copy the kernel) fixes this issue, for me. If someone could verify, please do.

root:9# ls -lisa /usr/src/sys/arch/i386/compile/FLASHRD/obj/bsd*
236818 24768 -rwxr-xr-x  1 root  wobj  12651229 Apr 18 10:07 /usr/src/sys/arch/i386/compile/FLASHRD/obj/bsd*
234845    12 -rw-r--r--  1 root  wobj      4320 Apr 13 10:32 /usr/src/sys/arch/i386/compile/FLASHRD/obj/bsd-comp.d
234842    52 -rw-r--r--  1 root  wobj     24712 Apr 13 10:32 /usr/src/sys/arch/i386/compile/FLASHRD/obj/bsd-comp.o
236817 81856 -rwxr-xr-x  1 root  wobj  41888784 Apr 18 10:07 /usr/src/sys/arch/i386/compile/FLASHRD/obj/bsd.gdb*

mkkern (ksh -x) output:

+ echo -n Compiling FLASHRD kernel
Compiling FLASHRD kernel+ cd /usr/src/sys/arch/i386/compile/FLASHRD
+ echo -n  (make depend)
 (make depend)+ c 0 make depend > /tmp/flashrd.Etkkkb/last.output 2>&1
+ grep make clean /tmp/flashrd.Etkkkb/mkkern.FLASHRD.DOOuBz
+ > /dev/null
+ echo -n  (make)
 (make)+ sysctl -n hw.ncpu
+ c 0 make -j2> /tmp/flashrd.Etkkkb/last.output 2>&1
+ c 0 cp bsd /tmp/flashrd.Etkkkb/tmpmnt/bsd
cp: bsd: No such file or directory
% cp bsd /tmp/flashrd.Etkkkb/tmpmnt/bsd failure
% ./mkkern failure
% TMPDIR: /tmp/flashrd.Etkkkb

[tdelsol]

Thanks for this quick fix.