Skip to content

build: drop the gnome-build-meta junction - #280

Merged
jeefy merged 7 commits into
projectbluefin:mainfrom
jeefy:refactor/drop-gnome-build-meta
Sep 29, 2026
Merged

jeefy merged 7 commits into
projectbluefin:mainfrom
jeefy:refactor/drop-gnome-build-meta

Conversation

@jeefy

@jeefy jeefy commented Sep 29, 2026

Copy link
Copy Markdown
Collaborator

Summary

Removes the gnome-build-meta junction. It was only used for two things, and both come straight from the freedesktop-sdk junction.

  • include/runtime.yml: project.conf included gnome-build-meta.bst:freedesktop-sdk.bst:include/runtime.yml. gnome-build-meta.bst overrides its freedesktop-sdk.bst with ours, so that file was already our FSDK's include/runtime.yml. The include is now freedesktop-sdk.bst:include/runtime.yml.
  • collect_initial_scripts plugin: freedesktop-sdk ships this plugin itself (plugins/elements/collect_initial_scripts.py, MIT, SPDX header). project.conf now loads it from the freedesktop-sdk.bst junction. There's nothing to vendor. The only code difference is that FSDK uses get_str where gnome-build-meta calls the deprecated node_subst_vars.

Also removed:

  • elements/gnome-build-meta.bst and patches/gnome-build-meta/
  • the gnome: source alias (only the junction used it)
  • the Renovate rule and the check-renovate-series.py entry, with their tests
  • the pre-commit file filter
  • the gnome-build-meta half of track-junctions.yml
  • the comment in elements/freedesktop-sdk.bst explaining why FSDK's systemd isn't overridden onto gnome-build-meta's
  • mentions in the docs and SECURITY.md

Separate fix: fix(ci) in track-junctions.yml. The workflow's sync step still ran sed on release-version:. project.conf calls it installer-version, so the sed matched nothing, and every FSDK point-release bump would fail check-release-version.py before its PR opened. It now syncs installer-version. I tested the sed against project.conf: it rewrites the value and the checker reacts.

Verification: /usr unchanged

  • bst show gives the same cache key for every element before and after, including os-initial-scripts.bst 4496ca7e…, bluefin-server-usr.bst 55ecba86… and bluefin-server-image.bst 781449c4….
  • Identical keys would hide a plugin behaviour change, so I also forced a rebuild with a temporary dummy environment variable on os-initial-scripts.bst:
    • Built with the FSDK plugin, the collected /etc/fdsdk/initial_scripts/* are identical to the gnome-build-meta plugin's (diff -r is empty).
    • The oci/bluefin-server-usr.bst rebuilt on top of them is byte-identical to upstream main: usr.raw sha256 8e008a0c…, usr-verity.raw f661a80b…, usrhash 91ba8a79….
    • Byte identity covers the file list, os-release, setuid bits and file capabilities, so a separate extract-and-diff would add nothing.
  • The image contents don't change, so this PR needs no dogfood boot.

Gates

  • python3 -m pytest tests/unit -q passes: 371 in a throwaway worktree with no boot-keys.
  • bats tests/unit passes: 0 failures.
  • docs-checks.py passes.
  • flock … just validate passes; check-renovate-series.py reports 1 junction.

project.conf doesn't conflict with #269: its collect_manifest line sits a few lines above the plugin block changed here.

jeefy and others added 7 commits September 29, 2026 00:15
…ction

project.conf reached FSDK's include/runtime.yml through gnome-build-meta's
freedesktop-sdk.bst, which gnome-build-meta.bst overrides with ours, so the
include was already our FSDK's file. freedesktop-sdk ships collect_initial_scripts
itself (plugins/elements/, MIT); load it from that junction instead.

Every element keeps its cache key, and a forced rebuild of
os-initial-scripts.bst with the FSDK plugin followed by
oci/bluefin-server-usr.bst gave byte-identical initial scripts, usr.raw and
usr-verity.raw (usrhash 91ba8a79...).

Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Nothing in the graph loads from gnome-build-meta any more. Drop its
Renovate rule, its entry in check-renovate-series.py and the pre-commit
file filter, and track only freedesktop-sdk.bst in track-junctions.yml.

Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Also drops the gnome: source alias (only the junction used it) and the
elements/freedesktop-sdk.bst comment explaining why FSDK's systemd is not
overridden onto gnome-build-meta's.

Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
project.conf renamed release-version to installer-version, but the
tracker's sed still matched release-version. It changed nothing, so an FSDK
point-release bump failed check-release-version.py before opening its PR.

Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keeps this branch's track-junctions row (no gnome-build-meta) and main's
changes/build/boot-test rows in the ci-tooling.md job table.

Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Assisted-by: Claude Opus 5.5 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@jeefy
jeefy merged commit ed736ca into projectbluefin:main Sep 29, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant