vh/forgefirm
1
0
Fork 0
mirror of https://github.com/openglow-org/forgefirm.git synced 2026-09-28 01:01:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

ffboot: display the factory semantic version, not the datetime

Browse Source 
A factory slot's displayed version is now the semantic FIRMWARE_VERSION
from /etc/build (e.g. v2.6.0-2228) rather than the build datetime in
/etc/version - what the factory itself calls the release, and what the
update-manager GUI shows for each slot. The datetime still orders
releases for the -e newest-factory selection (a monotonic counter;
mashing the semantic version's digits would misorder a major-version
rollover). Bench: slot shows v2.6.0-2228, -e picks it correctly.
This commit is contained in:
ScottW514
2026-08-08 14:26:01 -04:00
parent 00f77f7985
commit 630c9c3da4
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ffboot
+17 -4
View File
@@ -45,9 +45,10 @@ BOOTED_ROOT=$(sed -n 's/.*root=\([^ ]*\).*/\1/p' /proc/cmdline)
# --- partition probe --------------------------------------------------------- # --- partition probe ---------------------------------------------------------
# probe_part <device> # probe_part <device>
# Sets: P_PRESENT P_STATE(ok|empty|unreadable) P_TYPE(forgefirm|factory|unknown) # Sets: P_PRESENT P_STATE(ok|empty|unreadable) P_TYPE(forgefirm|factory|unknown)
# P_VERSION P_KERNEL(yes|no) # P_VERSION (display) P_DATE (build datetime, for ordering) P_KERNEL(yes|no)
probe_part () { probe_part () {
P_PRESENT=no; P_STATE=unreadable; P_TYPE=unknown; P_VERSION=""; P_KERNEL=no P_PRESENT=no; P_STATE=unreadable; P_TYPE=unknown
P_VERSION=""; P_DATE=""; P_KERNEL=no
P_MOUNTED="" P_MOUNTED=""
[ -b "$1" ] || return 1 [ -b "$1" ] || return 1
P_PRESENT=yes P_PRESENT=yes
@@ -74,7 +75,17 @@ probe_part () {
P_VERSION=$(cat "$ROOT_DIR/etc/forgefirm-version") P_VERSION=$(cat "$ROOT_DIR/etc/forgefirm-version")
elif [ -f "$ROOT_DIR/etc/version" ]; then elif [ -f "$ROOT_DIR/etc/version" ]; then
P_TYPE=factory; P_STATE=ok P_TYPE=factory; P_STATE=ok
P_VERSION=$(cat "$ROOT_DIR/etc/version") # The build datetime orders releases reliably (used by -e); the
# semantic FIRMWARE_VERSION in /etc/build is what the factory calls
# the release and what we display (fall back to the datetime).
P_DATE=$(cat "$ROOT_DIR/etc/version")
FV=$(sed -n 's/^FIRMWARE_VERSION[[:space:]]*=[[:space:]]*\([^[:space:]]*\).*/\1/p' \
"$ROOT_DIR/etc/build" 2>/dev/null)
if [ -n "$FV" ]; then
P_VERSION="v$FV"
else
P_VERSION="$P_DATE"
fi
else else
P_STATE=empty P_STATE=empty
fi fi
@@ -179,7 +190,9 @@ case "$MODE" in
for CAND in 1 2; do for CAND in 1 2; do
probe_part "/dev/mmcblk2p$CAND" || continue probe_part "/dev/mmcblk2p$CAND" || continue
[ "$P_TYPE" = "factory" ] || continue [ "$P_TYPE" = "factory" ] || continue
V=$(echo "$P_VERSION" | tr -cd '0-9') # Order by the build datetime (monotonic), not the semantic
# version string.
V=$(echo "$P_DATE" | tr -cd '0-9')
[ -n "$V" ] || V=0 [ -n "$V" ] || V=0
if [ -z "$MMCPART" ] || [ "$V" -gt "$BEST" ]; then if [ -z "$MMCPART" ] || [ "$V" -gt "$BEST" ]; then
MMCPART=$CAND; BEST=$V MMCPART=$CAND; BEST=$V