From 9f365fe933c8696be9d405a65b18e0de8a6ba0b0 Mon Sep 17 00:00:00 2001
From: c0dev0id <sh+git@codevoid.de>
Date: Sun, 8 Jun 2025 11:15:49 +0200
Subject: [PATCH] Update 2025-06-08 11:15 OpenBSD/amd64-t14

---
 .bin/mount_tank |  2 +-
 .bin/obsdmake   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.bin/mount_tank b/.bin/mount_tank
index 53dea85..722a99f 100755
--- a/.bin/mount_tank
+++ b/.bin/mount_tank
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if mount | fgrep '/tank/' -q
+if mount | fgrep -q '/tank/'
 then
     echo "already mounted"
     exit 1
diff --git a/.bin/obsdmake b/.bin/obsdmake
index 7f8a568..c3d6516 100755
--- a/.bin/obsdmake
+++ b/.bin/obsdmake
@@ -8,6 +8,8 @@ abort() { echo "Abort with >$0 $ARGS< on $(date)" >> /tmp/obsdmake.log; }
 
 JOBS="${JOBS:=$(sysctl -n hw.ncpuonline)}"
 
+LOG="/tmp/obsdmake.log"
+
 export CCACHE_DIR="/var/ccache"
 export CCACHE_SLOPPINESS="locale,time_macros,random_seed,file_stat_matches,pch_defines"
 export CCACHE_MAXSIZE=20G
@@ -24,12 +26,13 @@ if [ -z "$1" ]; then
     exit 2
 fi
 
-echo "Start with >$0 $ARGS< on $(date)" >> /tmp/obsdmake.log
+echo "Start with >$0 $ARGS< on $(date)" >> $LOG
 
 doas mkdir -p /usr/obj /usr/xobj
 doas chown build /usr/obj /usr/xobj
 
 mkkernel() {
+    echo "Step: kernel start ($(date)") >> $LOG
     set -xe
     cd /sys/arch/$(machine)/compile/GENERIC.MP
     doas make clean
@@ -39,9 +42,11 @@ mkkernel() {
     doas make install
     doas what /bsd
     doas ln -f /bsd.booted /bsd.backup
+    echo "Step: kernel done ($(date)") >> $LOG
 }
 
 mkbase() {
+    echo "Step: base start ($(date)") >> $LOG
     set -xe
     cd /usr/src
     doas make obj
@@ -50,9 +55,11 @@ mkbase() {
     doas sysmerge
     cd /dev
     doas ./MAKEDEV all
+    echo "Step: base done ($(date)") >> $LOG
 }
 
 mkxenocara() {
+    echo "Step: xenocara start ($(date)") >> $LOG
     set -xe
     doas chown -R sdk /usr/xenocara
     cd /usr/xenocara
@@ -61,9 +68,11 @@ mkxenocara() {
     doas make obj
     doas make -j${JOBS} build
     doas make install
+    echo "Step: xenocara done ($(date)") >> $LOG
 }
 
 mkrelease() {
+    echo "Step: release start ($(date)") >> $LOG
     set -xe
     doas mkdir -p /data/{OpenBSD,Release}
     doas chown -R build /data
@@ -86,6 +95,7 @@ mkrelease() {
     cd /usr/src/distrib/$(machine)/iso
     doas make
     doas make install
+    echo "Step: release done ($(date)") >> $LOG
 }
 
 kernelclean() {
@@ -127,5 +137,5 @@ case "$1" in
     all) mkkernel; mkbase; mkxenocara; ;;
 esac
 
-echo "Finished with >$0 $ARGS< on $(date)" >> /tmp/obsdmake.log
+echo "Finished with >$0 $ARGS< on $(date)" >> $LOG
 sync