vasilito
4768267762
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)
42 lines
2.7 KiB
TOML
42 lines
2.7 KiB
TOML
# fork-upstream-map.toml — Authoritative mapping of local Cat 2 fork
|
|
# directories to their upstream Redox repositories and the upstream
|
|
# release tag each fork is based on. Updated by
|
|
# local/scripts/refresh-fork-upstream-map.sh. Consumed by
|
|
# local/scripts/verify-fork-versions.sh to enforce the "no fake version
|
|
# label" rule (local/AGENTS.md § "No-fake-version-label rule").
|
|
#
|
|
# Format: one line per fork:
|
|
# <fork-name> <upstream-git-url> <upstream-release-tag>
|
|
#
|
|
# A fork with `<X.Y.Z>-rbN>` in its Cargo.toml MUST have its
|
|
# `<X.Y.Z>` part match the upstream tag listed here, and the source
|
|
# content MUST be a real rebase onto that upstream tag plus documented
|
|
# Red Bear patches (in local/patches/<name>/).
|
|
#
|
|
# On branch 0.3.0, all Cat 2 forks use the +rb0.3.0 build-metadata suffix
|
|
# in their Cargo.toml version fields (e.g. 0.6.0+rb0.3.0).
|
|
|
|
# Format: <fork-name> <upstream-git-url> <upstream-release-tag> [snapshot]
|
|
#
|
|
# The optional 4th column "snapshot" marks forks whose git history is
|
|
# unrelated to upstream (imported from archived snapshots, not cloned).
|
|
# For snapshot forks, verify-fork-versions.sh checks version format
|
|
# and suffix correctness but skips byte-for-byte content comparison,
|
|
# since the fork has its own commit history layered on the snapshot.
|
|
#
|
|
# A fork with `<X.Y.Z>-rb<B.B.B>` in its Cargo.toml MUST have its
|
|
# `<X.Y.Z>` part match the upstream tag listed here, and the source
|
|
# content MUST be a real rebase onto that upstream tag plus documented
|
|
# Red Bear patches (in local/patches/<name>/).
|
|
|
|
syscall https://gitlab.redox-os.org/redox-os/syscall.git 0.9.0 snapshot
|
|
libredox https://gitlab.redox-os.org/redox-os/libredox.git 0.1.18 snapshot
|
|
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.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
|
|
base https://gitlab.redox-os.org/redox-os/base.git main tracked
|