installer v2: single-stage slot install; slotmigrate legacy reclaim

install-forgefirm.sh is now single-stage and never repartitions: run
from factory firmware, it archives every factory slot version plus the
recovery boot partitions to /data/forgefirm/archive (manifest with
md5s), verifies the signed forgefirm.fw against the embedded ForgeFIRM
pubkey (raw 32-byte form for the factory's fwup 0.14.2; dev key until
the production key ceremony), applies it to the INACTIVE slot with the
factory's own fwup, post-verifies the written rootfs, installs
/data/ffboot, and flips the saved env with read-back verification. The
booted factory slot stays installed and bootable; /data is untouched
beyond the archive. Fixed release asset name forgefirm.fw (version in
the fwup metadata and release tag).

slotmigrate (new recipe, rcS before mountall) reclaims the legacy
layout on eMMC-slot boots: deletes p4, grows p3 to the end of the
disk (sfdisk + partx BLKPG - works with a sibling partition as root),
then e2fsck+resize2fs. Every step is keyed off the actual disk state,
so interrupted runs resume and factory-layout disks are a no-op; SD
boots never touch the eMMC.

meta-forgefirm/recipes-forgefirm/images/forgefirm-image.bb

@@ -19,7 +19,8 @@ IMAGE_INSTALL:remove = "gfui-client"
 # fwup: applies signed .fw archives (ForgeFIRM upgrades + factory restore)
 # to the inactive rootfs slot.
 # ffboot: boot-slot inventory and switching (also ships fw_env.config).
-IMAGE_INSTALL:append = " grblhal-glowforge forgectrl gfhome v4l-utils fwup ffboot"
+# slotmigrate: boot-time reclaim of the legacy p4 layout (grows /data).
+IMAGE_INSTALL:append = " grblhal-glowforge forgectrl gfhome v4l-utils fwup ffboot slotmigrate"
 
 # The release rootfs must fit a 200 MiB factory eMMC slot (409600 blocks).
 # Sizing: content + 40 MiB working space, hard-capped at the slot size —

meta-forgefirm/recipes-forgefirm/slotmigrate/files/slotmigrate

@@ -0,0 +1,83 @@
+#!/bin/sh
+# (C) Copyright 2020-2026
+# Scott Wiederhold, s.e.wiederhold@gmail.com
+# https://community.openglow.org
+# SPDX-License-Identifier:    MIT
+#
+# Legacy-layout migration: reclaims the legacy ForgeFIRM partition (p4)
+# and grows /data (p3) to the end of the eMMC, restoring the factory
+# disk footprint. Runs in rcS before mountall, so /data is not yet
+# mounted. Every step is keyed off the actual disk state - an
+# interrupted run resumes on the next boot; a factory-layout disk is a
+# fast no-op. Only acts when booted from an eMMC rootfs slot: SD boots
+# (bench/dev) never touch the eMMC and p4 itself must not saw off its
+# own branch.
+
+DISK=/dev/mmcblk2
+P3=${DISK}p3
+
+log () { echo "slotmigrate: $*"; }
+
+case "$1" in
+  start|"") ;;
+  *) exit 0 ;;
+esac
+
+# Runs at S02, possibly before the sysfs/proc mount scripts.
+mountpoint -q /proc 2>/dev/null || mount -t proc proc /proc 2>/dev/null
+mountpoint -q /sys 2>/dev/null || mount -t sysfs sysfs /sys 2>/dev/null
+
+[ -r /proc/cmdline ] || exit 0
+ROOT=$(sed -n 's/.*root=\([^ ]*\).*/\1/p' /proc/cmdline)
+case "$ROOT" in
+  /dev/mmcblk2p1|/dev/mmcblk2p2) ;;
+  *) exit 0 ;;
+esac
+
+command -v sfdisk >/dev/null || { log "sfdisk missing, skipping"; exit 0; }
+if grep -q "^${P3} " /proc/mounts; then
+  log "/data already mounted, skipping this boot"
+  exit 0
+fi
+
+# --- partition table -----------------------------------------------------
+if sfdisk -d "$DISK" 2>/dev/null | grep -q "^${DISK}p4"; then
+  log "removing legacy partition p4"
+  sfdisk --no-reread --force --delete "$DISK" 4 >/dev/null 2>&1 \
+    || { log "p4 delete FAILED"; exit 0; }
+  partx -d --nr 4 "$DISK" 2>/dev/null
+fi
+
+DISK_SECT=$(blockdev --getsz "$DISK")
+P3_START=$(sfdisk -d "$DISK" 2>/dev/null | sed -n "s|^${P3} : start=[ ]*\([0-9]*\),.*|\1|p")
+P3_SIZE=$(sfdisk -d "$DISK" 2>/dev/null | sed -n "s|^${P3} .*size=[ ]*\([0-9]*\),.*|\1|p")
+[ -n "$P3_START" ] && [ -n "$P3_SIZE" ] || { log "cannot read p3 geometry"; exit 0; }
+
+if [ $((P3_START + P3_SIZE)) -lt "$DISK_SECT" ]; then
+  log "growing p3 to the end of the disk ($((P3_START + P3_SIZE)) -> $DISK_SECT sectors)"
+  echo ", +" | sfdisk --no-reread --force -N 3 "$DISK" >/dev/null 2>&1 \
+    || { log "p3 grow FAILED"; exit 0; }
+  partx -u --nr 3 "$DISK" 2>/dev/null
+fi
+
+# --- filesystem ----------------------------------------------------------
+PART_SECT=$(blockdev --getsz "$P3")
+FS_BLOCKS=$(tune2fs -l "$P3" 2>/dev/null | sed -n 's/^Block count:[ ]*//p')
+FS_BSIZE=$(tune2fs -l "$P3" 2>/dev/null | sed -n 's/^Block size:[ ]*//p')
+[ -n "$FS_BLOCKS" ] && [ -n "$FS_BSIZE" ] || { log "cannot read p3 filesystem"; exit 0; }
+
+FS_SECT=$((FS_BLOCKS * (FS_BSIZE / 512)))
+if [ "$FS_SECT" -lt $((PART_SECT - 2048)) ]; then
+  log "growing /data filesystem ($FS_SECT -> $PART_SECT sectors)"
+  e2fsck -f -p "$P3" >/dev/null 2>&1
+  RC=$?
+  if [ "$RC" -ge 4 ]; then
+    log "e2fsck found errors (rc=$RC), NOT resizing"
+    exit 0
+  fi
+  resize2fs "$P3" >/dev/null 2>&1 \
+    && log "/data grown to full size" \
+    || log "resize2fs FAILED (will retry next boot)"
+fi
+
+exit 0

meta-forgefirm/recipes-forgefirm/slotmigrate/slotmigrate.bb

@@ -0,0 +1,28 @@
+SUMMARY = "Boot-time migration from the legacy ForgeFIRM disk layout"
+DESCRIPTION = "Reclaims the legacy ForgeFIRM eMMC partition (p4) and grows \
+/data back to the factory footprint. Runs before mountall; state-derived \
+and idempotent; a factory-layout disk is a no-op. Acts only when booted \
+from an eMMC rootfs slot."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+SRC_URI = "file://slotmigrate"
+
+S = "${WORKDIR}"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "slotmigrate"
+INITSCRIPT_PARAMS = "start 2 S ."
+
+RDEPENDS:${PN} = " \
+    util-linux-sfdisk \
+    util-linux-partx \
+    e2fsprogs-e2fsck \
+    e2fsprogs-tune2fs \
+    e2fsprogs-resize2fs \
+"
+
+do_install() {
+    install -Dm 0755 ${WORKDIR}/slotmigrate ${D}${sysconfdir}/init.d/slotmigrate
+}