From 21c4a423332e01e3752be39307b4ff999135de6f Mon Sep 17 00:00:00 2001 From: Michael Chus Date: Thu, 5 Mar 2026 11:32:26 +0300 Subject: [PATCH] fix: install profile to ~/.mkimage, pass overlay via BEE_OVERLAY_DIR env --- iso/builder/build-debug.sh | 10 +++++++++- iso/builder/mkimg.bee_debug.sh | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/iso/builder/build-debug.sh b/iso/builder/build-debug.sh index 58ccc8f..fbc14e5 100644 --- a/iso/builder/build-debug.sh +++ b/iso/builder/build-debug.sh @@ -89,7 +89,15 @@ mkdir -p "${DIST_DIR}" echo "" echo "=== building ISO ===" -# mkimage.sh uses git internally; run it from /tmp to avoid conflicts with bee repo +# Install our mkimage profile where mkimage.sh can find it. +# ~/.mkimage is the user plugin directory loaded by mkimage.sh. +mkdir -p "${HOME}/.mkimage" +cp "${BUILDER_DIR}/mkimg.bee_debug.sh" "${HOME}/.mkimage/" + +# Export overlay dir so the profile script can find it regardless of SRCDIR. +export BEE_OVERLAY_DIR="${OVERLAY_DIR}" + +# mkimage.sh uses git internally; run from /tmp to avoid conflicts with bee repo. cd /tmp sh /usr/share/aports/scripts/mkimage.sh \ --tag "v${ALPINE_VERSION}" \ diff --git a/iso/builder/mkimg.bee_debug.sh b/iso/builder/mkimg.bee_debug.sh index 9e70793..bbfbe57 100644 --- a/iso/builder/mkimg.bee_debug.sh +++ b/iso/builder/mkimg.bee_debug.sh @@ -46,8 +46,8 @@ profile_bee_debug() { } build_bee_debug() { - # copy overlay files into rootfs - local overlay="${SRCDIR}/../../overlay-debug" + # BEE_OVERLAY_DIR is exported by build-debug.sh (absolute path). + local overlay="${BEE_OVERLAY_DIR}" if [ -d "$overlay" ]; then cp -r "${overlay}/." "${ROOTFS}/" fi