fix(build): resolve ISO version from plain v* tags (e.g. v2.6)

resolve_iso_version only matched iso/v* pattern; GUI release tags (v2, v2.1 ... v2.6) were ignored, falling back to the old v1.0.20 annotated tag via resolve_audit_version. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
feat(boot): set 1920x1080 resolution for framebuffer and GRUB
2026-03-27 23:11:33 +03:00 · 2026-03-27 23:10:18 +03:00
4 changed files with 23 additions and 2 deletions
--- a/iso/builder/auto/config
+++ b/iso/builder/auto/config
@@ -32,6 +32,6 @@ lb config noauto \
    --memtest none \
    --iso-volume "EASY-BEE" \
    --iso-application "EASY-BEE" \
-    --bootappend-live "boot=live components quiet nomodeset console=tty0 console=ttyS0,115200n8 loglevel=3 username=bee user-fullname=Bee modprobe.blacklist=nouveau" \
+    --bootappend-live "boot=live components quiet nomodeset video=1920x1080 console=tty0 console=ttyS0,115200n8 loglevel=3 username=bee user-fullname=Bee modprobe.blacklist=nouveau" \
    --apt-recommends false \
    "${@}"
--- a/iso/builder/build.sh
+++ b/iso/builder/build.sh
@@ -84,6 +84,15 @@ resolve_iso_version() {
            ;;
    esac

+    # Also accept plain v* tags (e.g. v2, v2.1 used for GUI releases)
+    tag="$(git -C "${REPO_ROOT}" describe --tags --match 'v*' --abbrev=7 --dirty 2>/dev/null || true)"
+    case "${tag}" in
+        v*)
+            echo "${tag#v}"
+            return 0
+            ;;
+    esac
+
    # Fall back to audit version so the name is still meaningful
    resolve_audit_version
 }
--- a/iso/builder/config/bootloaders/grub-pc/config.cfg
+++ b/iso/builder/config/bootloaders/grub-pc/config.cfg
@@ -8,7 +8,7 @@ else
 fi

 if loadfont $font ; then
-    set gfxmode=800x600
+    set gfxmode=1920x1080,1280x1024,auto
    set gfxpayload=keep
    insmod efi_gop
    insmod efi_uga
--- a/iso/overlay/etc/X11/xorg.conf.d/10-fbdev.conf
+++ b/iso/overlay/etc/X11/xorg.conf.d/10-fbdev.conf
@@ -4,7 +4,19 @@ Section "Device"
    Option      "fbdev" "/dev/fb0"
 EndSection

+Section "Monitor"
+    Identifier  "monitor0"
+    Modeline    "1920x1080" 148.50 1920 2008 2052 2200 1080 1084 1089 1125 +hsync +vsync
+    Option      "PreferredMode" "1920x1080"
+EndSection
+
 Section "Screen"
    Identifier  "screen0"
    Device      "fbdev"
+    Monitor     "monitor0"
+    DefaultDepth 24
+    SubSection "Display"
+        Depth   24
+        Modes   "1920x1080" "1280x1024" "1024x768"
+    EndSubSection
 EndSection