Repository navigation
build: drop the gnome-build-meta junction - #280
Merged
Merged
Conversation
…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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.confincludedgnome-build-meta.bst:freedesktop-sdk.bst:include/runtime.yml.gnome-build-meta.bstoverrides itsfreedesktop-sdk.bstwith ours, so that file was already our FSDK'sinclude/runtime.yml. The include is nowfreedesktop-sdk.bst:include/runtime.yml.collect_initial_scriptsplugin: freedesktop-sdk ships this plugin itself (plugins/elements/collect_initial_scripts.py, MIT, SPDX header).project.confnow loads it from thefreedesktop-sdk.bstjunction. There's nothing to vendor. The only code difference is that FSDK usesget_strwhere gnome-build-meta calls the deprecatednode_subst_vars.Also removed:
elements/gnome-build-meta.bstandpatches/gnome-build-meta/gnome:source alias (only the junction used it)check-renovate-series.pyentry, with their teststrack-junctions.ymlelements/freedesktop-sdk.bstexplaining why FSDK's systemd isn't overridden onto gnome-build-meta'sSECURITY.mdSeparate fix:
fix(ci)intrack-junctions.yml. The workflow's sync step still ransedonrelease-version:.project.confcalls itinstaller-version, so thesedmatched nothing, and every FSDK point-release bump would failcheck-release-version.pybefore its PR opened. It now syncsinstaller-version. I tested thesedagainstproject.conf: it rewrites the value and the checker reacts.Verification:
/usrunchangedbst showgives the same cache key for every element before and after, includingos-initial-scripts.bst4496ca7e…,bluefin-server-usr.bst55ecba86…andbluefin-server-image.bst781449c4….os-initial-scripts.bst:/etc/fdsdk/initial_scripts/*are identical to the gnome-build-meta plugin's (diff -ris empty).oci/bluefin-server-usr.bstrebuilt on top of them is byte-identical to upstreammain:usr.rawsha2568e008a0c…,usr-verity.rawf661a80b…, usrhash91ba8a79….os-release, setuid bits and file capabilities, so a separate extract-and-diff would add nothing.Gates
python3 -m pytest tests/unit -qpasses: 371 in a throwaway worktree with no boot-keys.bats tests/unitpasses: 0 failures.docs-checks.pypasses.flock … just validatepasses;check-renovate-series.pyreports 1 junction.project.confdoesn't conflict with #269: itscollect_manifestline sits a few lines above the plugin block changed here.