fix: install profile to ~/.mkimage, pass overlay via BEE_OVERLAY_DIR env
This commit is contained in:
@@ -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}" \
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user