vasilito
17094e5d6c
Replace ~50 individual mcopy/mmd calls with a single staging directory approach: stage all ESP files with native cp, then one mcopy -s. Add progress indicators, batch chmod +x on scripts. Reduces packaging time from 2+ min to ~13 sec.
175 lines
8.3 KiB
Bash
Executable File
175 lines
8.3 KiB
Bash
Executable File
#!/bin/sh
|
|
set -e
|
|
|
|
_SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|
HIPERISO_ROOT="$(cd "$_SCRIPT_DIR/.." && pwd)"
|
|
GRUB2_INSTALL="$HIPERISO_ROOT/build/grub2-204/INSTALL"
|
|
PAYLOAD="$HIPERISO_ROOT/build/payload"
|
|
STAGING="$HIPERISO_ROOT/build/staging"
|
|
|
|
_progress() { printf ' \033[1;34m[%d/8]\033[0m %s\n' "$1" "$2"; }
|
|
|
|
# ── Dependency checks ─────────────────────────────────────────────
|
|
command -v mcopy >/dev/null 2>&1 || { echo "ERROR: mtools (mmd/mcopy) required to build ESP image"; exit 1; }
|
|
command -v mkfs.vfat >/dev/null 2>&1 || { echo "ERROR: dosfstools (mkfs.vfat) required"; exit 1; }
|
|
|
|
GRUB_X64_DIR="$GRUB2_INSTALL/lib/grub/x86_64-efi"
|
|
[ -d "$GRUB_X64_DIR" ] || GRUB_X64_DIR="$HIPERISO_ROOT/src/grub2/grub/x86_64-efi"
|
|
|
|
KERNEL_SRC="$STAGING/efi/vmlinuz"
|
|
[ -f "$KERNEL_SRC" ] || KERNEL_SRC="$STAGING/vmlinuz"
|
|
|
|
EFI_BOOT_SRC="$HIPERISO_ROOT/grub2/bin/BOOTX64.EFI"
|
|
[ -f "$EFI_BOOT_SRC" ] || EFI_BOOT_SRC="$STAGING/efi/BOOTX64.EFI"
|
|
[ -f "$EFI_BOOT_SRC" ] || EFI_BOOT_SRC="$STAGING/EFI/BOOT/BOOTX64.EFI"
|
|
|
|
# Clean only subdirectories this script fully repopulates.
|
|
# Preserve tool/ (languages.json, HiperisoGTK.glade, GUI binaries)
|
|
# and WebUI/plugson.www from build_gui_all.sh.
|
|
rm -rf "$PAYLOAD"/boot "$PAYLOAD"/config "$PAYLOAD"/hiperiso "$PAYLOAD"/EFI "$PAYLOAD"/grub
|
|
mkdir -p "$PAYLOAD/boot"
|
|
mkdir -p "$PAYLOAD/config"
|
|
mkdir -p "$PAYLOAD/hiperiso"
|
|
mkdir -p "$PAYLOAD/EFI/BOOT"
|
|
mkdir -p "$PAYLOAD/EFI/hiperiso/trace"
|
|
mkdir -p "$PAYLOAD/grub"
|
|
mkdir -p "$PAYLOAD/tool/x86_64"
|
|
|
|
_progress 1 "Copying boot images & EFI payloads..."
|
|
# ── boot/ (BIOS boot images, vendored) ────────────────────────────
|
|
cp "$HIPERISO_ROOT/vendor/grub-i386-pc/boot.img" "$PAYLOAD/boot/boot.img"
|
|
cp "$HIPERISO_ROOT/vendor/grub-i386-pc/core.img" "$PAYLOAD/boot/core.img"
|
|
xz --check=crc32 "$PAYLOAD/boot/core.img"
|
|
|
|
# ── EFI/ (our custom GRUB2 EFI + hypervisor payloads) ───────────────
|
|
cp "$EFI_BOOT_SRC" "$PAYLOAD/EFI/BOOT/"
|
|
cp "$HIPERISO_ROOT/src/grub2/grub/grub.cfg" "$PAYLOAD/EFI/BOOT/"
|
|
[ -f "$HIPERISO_ROOT/vendor/secureboot/mmx64.efi" ] && \
|
|
cp "$HIPERISO_ROOT/vendor/secureboot/mmx64.efi" "$PAYLOAD/EFI/BOOT/"
|
|
|
|
cp "$KERNEL_SRC" "$PAYLOAD/EFI/hiperiso/vmlinuz"
|
|
cp "$STAGING/initramfs.cpio.gz" "$PAYLOAD/EFI/hiperiso/"
|
|
cp "$STAGING/OVMF.fd" "$PAYLOAD/EFI/hiperiso/"
|
|
cp "$STAGING/hiperiso-log" "$PAYLOAD/EFI/hiperiso/"
|
|
cp "$HIPERISO_ROOT/logging/trace-"*.events "$PAYLOAD/EFI/hiperiso/trace/"
|
|
|
|
_progress 2 "Copying GRUB2 configs, themes & modules..."
|
|
# ── grub/ (configs, themes, modules from GRUB2 2.04 build) ──────────
|
|
cp "$HIPERISO_ROOT/src/grub2/grub/grub.cfg" "$PAYLOAD/grub/"
|
|
cp -a "$GRUB_X64_DIR" "$PAYLOAD/grub/x86_64-efi"
|
|
|
|
mkdir -p "$PAYLOAD/grub/i386-pc"
|
|
cp "$HIPERISO_ROOT/vendor/grub-i386-pc/"*.lst "$PAYLOAD/grub/i386-pc/" 2>/dev/null || true
|
|
cp "$HIPERISO_ROOT/vendor/grub-i386-pc/"*.mod "$PAYLOAD/grub/i386-pc/" 2>/dev/null || true
|
|
|
|
for cfg in checksum.cfg debug.cfg hwinfo.cfg keyboard.cfg localboot.cfg menulang.cfg power.cfg; do
|
|
cp "$HIPERISO_ROOT/src/grub2/grub/$cfg" "$PAYLOAD/grub/" 2>/dev/null || true
|
|
done
|
|
for dir in distro help menu themes fonts; do
|
|
cp -a "$HIPERISO_ROOT/src/grub2/grub/$dir" "$PAYLOAD/grub/" 2>/dev/null || true
|
|
done
|
|
|
|
if [ -d "$PAYLOAD/grub/help" ]; then
|
|
tar -C "$PAYLOAD/grub" -czf "$PAYLOAD/grub/help.tar.gz" help
|
|
fi
|
|
|
|
if [ -d "$PAYLOAD/grub/menu" ]; then
|
|
tar -C "$PAYLOAD/grub" -czf "$PAYLOAD/grub/menu.tar.gz" menu
|
|
fi
|
|
|
|
_progress 3 "Copying installer tools & scripts..."
|
|
# ── tool/ (installer scripts + vendored assets + binary tools) ─────
|
|
cp "$HIPERISO_ROOT/src/installer/tool/hiperiso_lib.sh" "$PAYLOAD/tool/"
|
|
cp "$HIPERISO_ROOT/src/installer/tool/HiperisoWorker.sh" "$PAYLOAD/tool/"
|
|
cp "$HIPERISO_ROOT/src/installer/tool/create_hiperiso_iso_part_dm.sh" "$PAYLOAD/tool/"
|
|
cp "$HIPERISO_ROOT/assets/languages.json" "$PAYLOAD/tool/languages.json"
|
|
cp "$HIPERISO_ROOT/assets/HiperisoGTK.glade" "$PAYLOAD/tool/HiperisoGTK.glade"
|
|
[ -f "$HIPERISO_ROOT/vendor/secureboot/ENROLL_THIS_KEY_IN_MOKMANAGER.cer" ] && \
|
|
cp "$HIPERISO_ROOT/vendor/secureboot/ENROLL_THIS_KEY_IN_MOKMANAGER.cer" "$PAYLOAD/tool/"
|
|
|
|
for tool in ash hexdump mkexfatfs mount.exfat-fuse xzcat; do
|
|
cp "$HIPERISO_ROOT/vendor/tool-x86_64/$tool" "$PAYLOAD/tool/x86_64/"
|
|
done
|
|
[ -f "$PAYLOAD/tool/x86_64/Hiperiso2Disk.qt5" ] && chmod +x "$PAYLOAD/tool/x86_64/Hiperiso2Disk.qt5"
|
|
[ -f "$PAYLOAD/tool/x86_64/Hiperiso2Disk.gtk3" ] && chmod +x "$PAYLOAD/tool/x86_64/Hiperiso2Disk.gtk3"
|
|
|
|
# ── Top-level scripts ───────────────────────────────────────────────
|
|
for f in Hiperiso.sh HiperisoQt.sh HiperisoGtk.sh HiperisoWeb.sh HiperisoPlugson.sh \
|
|
Hiperiso2Disk.sh CreatePersistentImg.sh ExtendPersistentImg.sh hisocli hisolnk; do
|
|
cp "$HIPERISO_ROOT/src/installer/$f" "$PAYLOAD/"
|
|
chmod +x "$PAYLOAD/$f"
|
|
done
|
|
|
|
# ── config/ ─────────────────────────────────────────────────────────
|
|
cp "$HIPERISO_ROOT/config/hiperiso.json.example" "$PAYLOAD/config/"
|
|
|
|
# ── version ─────────────────────────────────────────────────────────
|
|
echo "1.0.0" > "$PAYLOAD/hiperiso/version"
|
|
|
|
_progress 4 "Extracting support files..."
|
|
# Extract Ventoy-derived support files for direct boot path
|
|
if [ -f "$HIPERISO_ROOT/vendor/support-x64.tar.xz" ]; then
|
|
tar -xJf "$HIPERISO_ROOT/vendor/support-x64.tar.xz" -C "$STAGING/"
|
|
cp -a "$STAGING/support-x64/"* "$PAYLOAD/hiperiso/"
|
|
fi
|
|
|
|
rm -f "$PAYLOAD/log.txt"
|
|
|
|
sed -i 's/ventoy/hiperiso/g' "$PAYLOAD/grub/i386-pc/moddep.lst" 2>/dev/null || true
|
|
sed -i 's/ventoy/hiperiso/g' "$PAYLOAD/grub/x86_64-efi/moddep.lst" 2>/dev/null || true
|
|
|
|
_progress 5 "Staging ESP content tree..."
|
|
ESP_IMG="$PAYLOAD/hiperiso/hiperiso.disk.img"
|
|
ESP_STAGING=$(mktemp -d)
|
|
trap 'rm -rf "$ESP_STAGING"' EXIT INT TERM
|
|
|
|
mkdir -p "$ESP_STAGING/EFI/BOOT" "$ESP_STAGING/EFI/hiperiso/trace" \
|
|
"$ESP_STAGING/grub" "$ESP_STAGING/tool" "$ESP_STAGING/hiperiso"
|
|
|
|
cp "$PAYLOAD/EFI/BOOT/BOOTX64.EFI" "$PAYLOAD/EFI/BOOT/grub.cfg" "$ESP_STAGING/EFI/BOOT/"
|
|
[ -f "$PAYLOAD/EFI/BOOT/mmx64.efi" ] && cp "$PAYLOAD/EFI/BOOT/mmx64.efi" "$ESP_STAGING/EFI/BOOT/"
|
|
cp "$PAYLOAD/EFI/hiperiso/vmlinuz" "$PAYLOAD/EFI/hiperiso/initramfs.cpio.gz" \
|
|
"$PAYLOAD/EFI/hiperiso/OVMF.fd" "$PAYLOAD/EFI/hiperiso/hiperiso-log" "$ESP_STAGING/EFI/hiperiso/"
|
|
cp "$PAYLOAD"/EFI/hiperiso/trace/*.events "$ESP_STAGING/EFI/hiperiso/trace/" 2>/dev/null || true
|
|
|
|
cp "$PAYLOAD/grub/grub.cfg" "$ESP_STAGING/grub/"
|
|
for cfg in checksum.cfg debug.cfg hwinfo.cfg keyboard.cfg localboot.cfg menulang.cfg power.cfg; do
|
|
[ -f "$PAYLOAD/grub/$cfg" ] && cp "$PAYLOAD/grub/$cfg" "$ESP_STAGING/grub/" || true
|
|
done
|
|
[ -f "$PAYLOAD/grub/help.tar.gz" ] && cp "$PAYLOAD/grub/help.tar.gz" "$ESP_STAGING/grub/"
|
|
[ -f "$PAYLOAD/grub/menu.tar.gz" ] && cp "$PAYLOAD/grub/menu.tar.gz" "$ESP_STAGING/grub/"
|
|
for dir in themes fonts distro help menu; do
|
|
[ -d "$PAYLOAD/grub/$dir" ] && cp -a "$PAYLOAD/grub/$dir" "$ESP_STAGING/grub/" || true
|
|
done
|
|
|
|
cp "$PAYLOAD"/tool/x86_64/* "$ESP_STAGING/tool/" 2>/dev/null || true
|
|
cp "$PAYLOAD"/tool/*.sh "$PAYLOAD"/tool/*.json "$PAYLOAD"/tool/*.glade "$PAYLOAD"/tool/*.cer \
|
|
"$ESP_STAGING/tool/" 2>/dev/null || true
|
|
|
|
cp "$PAYLOAD/hiperiso/version" "$ESP_STAGING/hiperiso/"
|
|
for f in "$PAYLOAD"/hiperiso/*; do
|
|
[ -f "$f" ] || continue
|
|
case "$(basename "$f")" in hiperiso.disk.img*) continue ;; esac
|
|
cp "$f" "$ESP_STAGING/hiperiso/"
|
|
done
|
|
for d in 7z imdisk; do
|
|
[ -d "$PAYLOAD/hiperiso/$d" ] && cp -a "$PAYLOAD/hiperiso/$d" "$ESP_STAGING/hiperiso/" || true
|
|
done
|
|
|
|
_progress 6 "Creating 64MB FAT16 ESP image ($(find "$ESP_STAGING" -type f | wc -l) files, $(du -sh "$ESP_STAGING" | cut -f1))..."
|
|
dd if=/dev/zero of="$ESP_IMG" bs=1M count=64 2>/dev/null
|
|
mkfs.vfat -F 16 -n "HISOEFI" "$ESP_IMG" >/dev/null 2>&1
|
|
|
|
_progress 7 "Populating ESP (single mcopy)..."
|
|
mcopy -s -i "$ESP_IMG" "$ESP_STAGING/"* ::/ 2>/dev/null
|
|
rm -rf "$ESP_STAGING"
|
|
trap - EXIT INT TERM
|
|
|
|
_progress 8 "Compressing ESP image ($(du -h "$ESP_IMG" | cut -f1))..."
|
|
xz --check=crc32 "$ESP_IMG"
|
|
|
|
echo "=== hiperiso release package assembled ==="
|
|
du -sh "$PAYLOAD"
|
|
find "$PAYLOAD" -type f | wc -l
|
|
echo "files"
|