vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phase 10.2-10.3: fix kernel upstream tag + stale AGENTS.md claim

Browse Source 
Phase 10.2: Fix kernel fork upstream tag in fork-upstream-map.toml.
  - Kernel fork Cargo.toml claimed '0.5.12+rb0.3.1' tracking
    upstream tag 0.5.12 which does not exist remotely.
  - Every preflight run showed: 'WARN: kernel: couldn't ls-remote
    ... tag 0.5.12, skipping content check'
  - Verified: fork vs upstream 0.6.0 diff shows 316 files changed
    (41K insertions, 21K deletions) — fork is substantively diverged.
  - Fix: mark kernel as 'diverged' mode (like bootloader+installer)
    tracking 0.6.0 tag. The tag 0.6.0 is the nearest existing tag.
    Content check is skipped (diverged mode) — honest about state.

Phase 10.3: Fix AGENTS.md 'partially implemented' claim.
  - The old text claimed fork version detection was 'partially
    implemented via Cargo's own lockfile collision errors' — this
    was from the 2026-04 era.
  - Now fully implemented across 5 tools: sync-versions.sh,
    verify-fork-versions.sh, verify-patch-content.py, bump-fork.sh,
    push-fork-branches.sh. The full tool inventory is in
    local/docs/HOOKS.md (10 tools as of Phase 9.2).

After Phase 10.2, verify-fork-versions.sh output changes:
  Before: 'WARN: kernel: couldn't ls-remote ... tag 0.5.12'
  After:  'WARN: kernel is in diverged mode — content check skipped'
  (consistent with bootloader and installer warnings)
This commit is contained in:
vasilito
2026-07-12 12:25:50 +03:00
parent 40aa21fc8a
commit 4768267762
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AGENTS.md
+8 -4
View File
@@ -471,10 +471,14 @@ script (or equivalent `repo bump-fork <component>` command) MUST:
backward compatibility for recipes that reference the `recipes/` path while
still preferring the local fork as the source of truth.
**Implementation status**: Detection is partially implemented via Cargo's
own lockfile collision errors. Full automatic detection and remediation
requires changes to `src/cook/fetch.rs` (version comparison logic) and the
addition of `local/scripts/bump-fork.sh`. Until fully automated, the manual
**Implementation status**: Detection is fully implemented across 5 tools:
- `sync-versions.sh`: Cat 0 (cookbook) + Cat 1 (in-house) + Cat 2 (fork +rb suffix) versions
- `verify-fork-versions.sh`: Cat 2 fork supremacy + content check vs upstream tag
- `verify-patch-content.py`: orphan-patch detection + operator-decision automation
- `bump-fork.sh` + `upgrade-forks.sh`: fork rebase + patch reapplication
- `push-fork-branches.sh`: operator-reviewed fork push helper
See `local/docs/HOOKS.md` for the full tool inventory (10 tools as of Phase 9.2).
process is:
1. `cd local/sources/<component>`
2. Edit `Cargo.toml` version field to match upstream
local/fork-upstream-map.toml
+1 -1
View File
@@ -34,7 +34,7 @@ libredox https://gitlab.redox-os.org/redox-os/libredox.git 0.1.18 sna
redoxfs https://gitlab.redox-os.org/redox-os/redoxfs.git 0.9.1 snapshot
redox-scheme https://gitlab.redox-os.org/redox-os/redox-scheme.git 0.11.2 snapshot
relibc https://gitlab.redox-os.org/redox-os/relibc.git 0.2.5 snapshot
kernel https://gitlab.redox-os.org/redox-os/kernel.git 0.5.12 snapshot
kernel https://gitlab.redox-os.org/redox-os/kernel.git 0.6.0 diverged # fork tracks upstream/master via merge commits; 316 files / 41K lines diverge; full rebase is Phase 2.4+ work
bootloader https://gitlab.redox-os.org/redox-os/bootloader.git 1.0.0 diverged # fork advanced beyond upstream 1.0.0 (927 vs 77 files) -- full rebase to newer upstream tag is Phase 2.4+ work
installer https://gitlab.redox-os.org/redox-os/installer.git 0.2.42 diverged # fork has TUI GUI + Red Bear config additions not in upstream 0.2.42 -- content check advisory only; full rebase is Phase 2.4+ work
userutils https://gitlab.redox-os.org/redox-os/userutils.git 0.1.0 snapshot