WIP: Bind detached boot tools to configured catalog revisions #797

Draft
erikinkinen wants to merge 1 commit from fix/configured-boot-tool-revision into fix/configured-image-cargo-routing
Owner

Summary and rationale

ESP preparation selected the Bootloader default BootTool commit even when the configured provider catalog required another revision. Carry the canonical repository’s catalog pin through detached checkout preparation and packaging.

Tracking and scope

Builds on #791 and covers configured VM and appliance callers. Direct calls without a configured catalog retain their original revision selection.

Architecture and failure behavior

Reject conflicting caller revisions before checkout. Nested Cargo operations use storage beside the provider checkouts so original-source verification can enforce disjoint paths.

Validation evidence

Eleven BootTool handoff tests and seven configured-image tests pass. Markdown lint passes across 148 files. Hosted CI and guest acceptance are pending.

## Summary and rationale ESP preparation selected the Bootloader default BootTool commit even when the configured provider catalog required another revision. Carry the canonical repository’s catalog pin through detached checkout preparation and packaging. ## Tracking and scope Builds on #791 and covers configured VM and appliance callers. Direct calls without a configured catalog retain their original revision selection. ## Architecture and failure behavior Reject conflicting caller revisions before checkout. Nested Cargo operations use storage beside the provider checkouts so original-source verification can enforce disjoint paths. ## Validation evidence Eleven BootTool handoff tests and seven configured-image tests pass. Markdown lint passes across 148 files. Hosted CI and guest acceptance are pending.
erikinkinen added this to the Alpha 1 milestone 2026-11-21 03:36:59 +01:00
fix: Bind detached boot tools to configured catalog revisions
Some checks failed
CI / rust (pull_request) Has been skipped
CI / native_sources (pull_request) Has been skipped
CI / host_zero (pull_request) Has been skipped
CI / host_one (pull_request) Has been skipped
CI / host_two (pull_request) Has been skipped
CI / host_three (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
Markdown / markdown (pull_request) Has been skipped
CI / rust (push) Failing after 5m43s
Markdown / markdown (push) Successful in 2m39s
CI / native_sources (push) Has been skipped
CI / host_zero (push) Has been skipped
CI / host_two (push) Has been skipped
CI / host_one (push) Has been skipped
CI / host_three (push) Has been skipped
CI / integration (push) Has been skipped
Coreutils provider graph / coreutils (push) Failing after 6m23s
a29b184bcc
Select the canonical boot-tool commit before preparing a detached checkout and forward that selection to packaging. Reject conflicting caller revisions. Place nested Cargo operations beside the selected checkouts so working outputs stay outside every original provider.
Some checks failed
CI / rust (pull_request) Has been skipped
CI / native_sources (pull_request) Has been skipped
CI / host_zero (pull_request) Has been skipped
CI / host_one (pull_request) Has been skipped
CI / host_two (pull_request) Has been skipped
CI / host_three (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
Markdown / markdown (pull_request) Has been skipped
CI / rust (push) Failing after 5m43s
Markdown / markdown (push) Successful in 2m39s
CI / native_sources (push) Has been skipped
CI / host_zero (push) Has been skipped
CI / host_two (push) Has been skipped
CI / host_one (push) Has been skipped
CI / host_three (push) Has been skipped
CI / integration (push) Has been skipped
Coreutils provider graph / coreutils (push) Failing after 6m23s
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'fix/configured-boot-tool-revision:fix/configured-boot-tool-revision'
git switch 'fix/configured-boot-tool-revision'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'fix/configured-image-cargo-routing'
git merge --no-ff 'fix/configured-boot-tool-revision'
git switch 'fix/configured-boot-tool-revision'
git rebase 'fix/configured-image-cargo-routing'
git switch 'fix/configured-image-cargo-routing'
git merge --ff-only 'fix/configured-boot-tool-revision'
git switch 'fix/configured-boot-tool-revision'
git rebase 'fix/configured-image-cargo-routing'
git switch 'fix/configured-image-cargo-routing'
git merge --no-ff 'fix/configured-boot-tool-revision'
git switch 'fix/configured-image-cargo-routing'
git merge --squash 'fix/configured-boot-tool-revision'
git switch 'fix/configured-image-cargo-routing'
git merge --ff-only 'fix/configured-boot-tool-revision'
git switch 'fix/configured-image-cargo-routing'
git merge 'fix/configured-boot-tool-revision'
git push origin 'fix/configured-image-cargo-routing'
Sign in to join this conversation.
No description provided.