From d02f063df9089e867c4565e59b59d14732031972 Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 1 Jul 2026 16:36:28 +0200 Subject: [PATCH 1/3] build: pin config-stable webconfig to the v0.4.0 FHS release Advances the stable channel's webconfig pin to v0.4.0, the first release carrying the /opt/airplanes on-device layout, so the stable overlay's webconfig units match the FHS layout the channel builds. --- runtime-overlay/config-stable | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime-overlay/config-stable b/runtime-overlay/config-stable index e1c41cb137..7374c86d61 100644 --- a/runtime-overlay/config-stable +++ b/runtime-overlay/config-stable @@ -36,12 +36,12 @@ export AIRPLANES_GRAPHS1090_REPO="${AIRPLANES_GRAPHS1090_REPO:-https://github.co export AIRPLANES_GRAPHS1090_BRANCH="${AIRPLANES_GRAPHS1090_BRANCH:-426c70c61889de2a8f63f2b40133ea72a08537ce}" # Webconfig — downloaded as a prebuilt release, not compiled in the overlay. -# Pinned to a concrete stable release (post-self-update-removal; the v0.1.x -# tags up to v0.1.2 still carried the removed self-update surface). COMMIT_SHA -# must equal the release manifest's commit_sha — stage-webconfig.sh hard-fails -# the build on mismatch. -export AIRPLANES_WEBCONFIG_RELEASE_TAG="${AIRPLANES_WEBCONFIG_RELEASE_TAG:-v0.3.0}" -export AIRPLANES_WEBCONFIG_COMMIT_SHA="${AIRPLANES_WEBCONFIG_COMMIT_SHA:-30448fe56d121268bb91fada04d48611d3fc2156}" +# Pinned to a concrete stable release. v0.4.0 is the first release carrying the +# /opt/airplanes FHS on-device layout, matching the overlay this channel builds. +# COMMIT_SHA must equal the release manifest's commit_sha — stage-webconfig.sh +# hard-fails the build on mismatch. +export AIRPLANES_WEBCONFIG_RELEASE_TAG="${AIRPLANES_WEBCONFIG_RELEASE_TAG:-v0.4.0}" +export AIRPLANES_WEBCONFIG_COMMIT_SHA="${AIRPLANES_WEBCONFIG_COMMIT_SHA:-7ed56223b1e8d844d5dde1c31690f6c03a9e139f}" # Feed scripts — overlay-built. The feed repo's only tag (v0.0.1) lags the dev # head, so the stable pin is the current feed dev HEAD SHA as of this pin date From 61cb0bc227e260e5a9c867c14e244fe4250bd6b0 Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 1 Jul 2026 16:51:32 +0200 Subject: [PATCH 2/3] build: pin config-stable feed to the FHS commit Advances the stable channel's feed pin to feed's /opt/airplanes FHS commit (which also ships the airplanes-stats units), so the stable overlay's feed payload matches the FHS layout and the dev channel. --- runtime-overlay/config-stable | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/runtime-overlay/config-stable b/runtime-overlay/config-stable index 7374c86d61..4a247b5931 100644 --- a/runtime-overlay/config-stable +++ b/runtime-overlay/config-stable @@ -43,11 +43,13 @@ export AIRPLANES_GRAPHS1090_BRANCH="${AIRPLANES_GRAPHS1090_BRANCH:-426c70c61889d export AIRPLANES_WEBCONFIG_RELEASE_TAG="${AIRPLANES_WEBCONFIG_RELEASE_TAG:-v0.4.0}" export AIRPLANES_WEBCONFIG_COMMIT_SHA="${AIRPLANES_WEBCONFIG_COMMIT_SHA:-7ed56223b1e8d844d5dde1c31690f6c03a9e139f}" -# Feed scripts — overlay-built. The feed repo's only tag (v0.0.1) lags the dev -# head, so the stable pin is the current feed dev HEAD SHA as of this pin date -# (the pin must be a 40-hex SHA per test_channel_configs.bats). +# Feed scripts — overlay-built. The feed repo's semver tags are reserved for +# launch, so the stable pin is a concrete feed dev SHA (must be 40-hex per +# test_channel_configs.bats). Pinned to the FHS commit (feed #144), which +# carries the /opt/airplanes layout and the airplanes-stats units so the stable +# overlay's feed payload matches this channel and the dev channel. export AIRPLANES_FEED_OVERLAY_REPO="${AIRPLANES_FEED_OVERLAY_REPO:-https://github.com/airplanes-live/feed.git}" -export AIRPLANES_FEED_OVERLAY_BRANCH="${AIRPLANES_FEED_OVERLAY_BRANCH:-18a07314a49f483e545d00da2532c72ccda03e5f}" +export AIRPLANES_FEED_OVERLAY_BRANCH="${AIRPLANES_FEED_OVERLAY_BRANCH:-481adbf91478c4f1ad035a858d502584214edcc0}" # Feeder readsb fork (outbound airplanes-feed binary). The repo's version tags # mirror upstream wiedehopf and lag the fork's dev head by hundreds of commits, From 7c7b1299d5d88f892865030f6f16d6c369e57bda Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 1 Jul 2026 16:51:32 +0200 Subject: [PATCH 3/3] fix: manage and enable the airplanes-stats units in the overlay The overlay globbed feed's airplanes-stats.{service,timer} into the payload but the manifest inputs never linked them into /etc/systemd/system or enabled the timer, so the stats push never ran. Add the managed_paths symlinks and the timer to systemd.json enable. --- runtime-overlay/manifest-inputs/managed_paths.json | 10 ++++++++++ runtime-overlay/manifest-inputs/systemd.json | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/runtime-overlay/manifest-inputs/managed_paths.json b/runtime-overlay/manifest-inputs/managed_paths.json index e13926a86a..ae628f7541 100644 --- a/runtime-overlay/manifest-inputs/managed_paths.json +++ b/runtime-overlay/manifest-inputs/managed_paths.json @@ -150,5 +150,15 @@ "mode": "symlink", "link": "/etc/systemd/system/airplanes-config-sync.timer", "target": "/opt/airplanes/current/systemd/airplanes-config-sync.timer" + }, + { + "mode": "symlink", + "link": "/etc/systemd/system/airplanes-stats.service", + "target": "/opt/airplanes/current/systemd/airplanes-stats.service" + }, + { + "mode": "symlink", + "link": "/etc/systemd/system/airplanes-stats.timer", + "target": "/opt/airplanes/current/systemd/airplanes-stats.timer" } ] diff --git a/runtime-overlay/manifest-inputs/systemd.json b/runtime-overlay/manifest-inputs/systemd.json index ea44a223ef..c4fa9ed05e 100644 --- a/runtime-overlay/manifest-inputs/systemd.json +++ b/runtime-overlay/manifest-inputs/systemd.json @@ -13,7 +13,8 @@ "airplanes-feed.service", "airplanes-mlat.service", "airplanes-diagnostics.timer", - "airplanes-config-sync.timer" + "airplanes-config-sync.timer", + "airplanes-stats.timer" ], "disable": [], "reload_or_restart": [