From 9508743dcd499b93c5536958604258d6a44393d6 Mon Sep 17 00:00:00 2001
From: Michael Chus <mike@mchus.pro>
Date: Thu, 5 Mar 2026 11:37:46 +0300
Subject: [PATCH] fix: add arch=x86_64 to profile, improve abuild key
 generation in setup

---
 iso/builder/mkimg.bee_debug.sh |  1 +
 iso/builder/setup-builder.sh   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/iso/builder/mkimg.bee_debug.sh b/iso/builder/mkimg.bee_debug.sh
index bbfbe57..a1ba0a3 100644
--- a/iso/builder/mkimg.bee_debug.sh
+++ b/iso/builder/mkimg.bee_debug.sh
@@ -6,6 +6,7 @@
 profile_bee_debug() {
     title="Bee Hardware Audit (debug)"
     desc="Hardware audit LiveCD with SSH access for testing"
+    arch="x86_64"
     image_ext="iso"
     output_format="iso"
     kernel_flavors="lts"
diff --git a/iso/builder/setup-builder.sh b/iso/builder/setup-builder.sh
index b525cf1..783ebe8 100644
--- a/iso/builder/setup-builder.sh
+++ b/iso/builder/setup-builder.sh
@@ -104,6 +104,24 @@ if [ ! -d /usr/share/aports ]; then
         /usr/share/aports
 fi
 
+# --- abuild signing key (required by mkimage.sh) ---
+if [ ! -f "${HOME}/.abuild/abuild.conf" ]; then
+    echo ""
+    echo "=== generating abuild signing key ==="
+    mkdir -p "${HOME}/.abuild"
+    abuild-keygen -a -n 2>/dev/null || true
+    # abuild-keygen requires doas to install the key system-wide; do it manually
+    PUB=$(ls "${HOME}/.abuild/"*.pub 2>/dev/null | head -1)
+    if [ -n "$PUB" ]; then
+        cp "$PUB" /etc/apk/keys/
+        PRIV="${PUB%.pub}"
+        echo "PACKAGER_PRIVKEY=\"${PRIV}\"" > "${HOME}/.abuild/abuild.conf"
+        echo "abuild key: $PRIV"
+    else
+        echo "WARNING: abuild key generation failed"
+    fi
+fi
+
 echo ""
 echo "=== builder setup complete ==="
 echo "Next: sh iso/builder/build-debug.sh"