Merge nucleic/lucid-lunar-wren-wxyw into dev

mkimage/build-rootfs.sh

@@ -25,8 +25,26 @@ while [ $# -gt 0 ]; do
 done
 
 VERSION="$(cat "$OS_DIR/VERSION")"
-SNAPSHOT="$(cat "$OS_DIR/SNAPSHOT")"
-SUITE="trixie"
+# Per-flavor base (NAROS.md §7.4): the VM DESKTOP flavor (N5) builds entirely from a pinned
+# Debian FORKY (testing) snapshot for GNOME 50 — trixie ships only GNOME 48 — while every
+# other tier, including the HEADLESS VM, stays on the trixie snapshot. One coherent pocket per
+# rootfs, no trixie/forky ABI mixing. VARIANT is the os-release identity class
+# (base/agent/runner/vm, §2.3); FLAVOR distinguishes the two VM rootfs builds within
+# VARIANT=vm (headless vs desktop).
+case "$TIER" in
+  vm-desktop)
+    SUITE="forky"; VARIANT="vm"; FLAVOR="desktop"
+    SNAPSHOT="$(cat "$OS_DIR/SNAPSHOT.forky" 2>/dev/null || cat "$OS_DIR/SNAPSHOT")"
+    ;;
+  vm)
+    SUITE="trixie"; VARIANT="vm"; FLAVOR="headless"
+    SNAPSHOT="$(cat "$OS_DIR/SNAPSHOT")"
+    ;;
+  *)
+    SUITE="trixie"; VARIANT="$TIER"; FLAVOR=""
+    SNAPSHOT="$(cat "$OS_DIR/SNAPSHOT")"
+    ;;
+esac
 MIRROR="https://snapshot.debian.org/archive/debian/${SNAPSHOT}/"
 PROFILE="$OS_DIR/mkimage/profiles/$TIER.pkgs"
 [ -f "$PROFILE" ] || { echo "no profile for tier '$TIER' ($PROFILE)" >&2; exit 2; }
@@ -89,7 +107,8 @@ mkdir -p "$OUT"
 TAR="$OUT/naros-$TIER-$VERSION-$ARCH.tar"
 
 export NAROS_TIER="$TIER" NAROS_VERSION="$VERSION" NAROS_ARCH="$ARCH" \
-       NAROS_CHANNEL="$CHANNEL" NAROS_SNAPSHOT="$SNAPSHOT" NAROS_SUITE="$SUITE"
+       NAROS_CHANNEL="$CHANNEL" NAROS_SNAPSHOT="$SNAPSHOT" NAROS_SUITE="$SUITE" \
+       NAROS_VARIANT="$VARIANT" NAROS_FLAVOR="$FLAVOR"
 
 HOOKS=()
 if [ "${#LATE_DEBS[@]}" -gt 0 ]; then