vasilito
538b1745d4
New local/docs/FORK-BUMP-PATCHING-POLICY.md, wired into AGENTS.md, local/AGENTS.md and docs/README.md. Core rule: a version bump is a REBASE, never a REPLACEMENT. Written from the libredox 0.1.19 incident, which hit three failures at once -- wholesale replacement that dropped the acpi re-export, F_DUPFD_CLOEXEC, the mandated authors entry and the Single-Repo repository URL; a version-named branch that also tripped the build's fork-branch gate; and a stale fork-upstream-map.toml that failed verify-fork-versions.sh with a fake-label violation. Covers the vendored recipe-fork mirror image (metadata moves, build input does not -- how Qt shipped 6.11.0 against a 6.11.1 recipe), patch handling during a bump, and toolchain bumps as version bumps. Also fixes the two bookkeeping gaps that failed this build: - local/fork-upstream-map.toml: libredox 0.1.18 -> 0.1.19, never updated when the fork was bumped. - verify-fork-versions.sh: record redoxfs's legitimate divergence in the declarative allowlist the script already provides for libredox, with the originating commit for each file --a936d00(Red Bear, Vec from alloc for no_std bootloader builds) for filesystem.rs and record.rs,852a971(Red Bear, RecvFd EOPNOTSUPP) for mount/redox/mod.rs, andd807dd3(upstream symlink fix imported ahead of the 0.9.1 tag) for mount/redox/scheme.rs. Documented rather than bypassed with REDBEAR_SKIP_FORK_VERIFY.
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.19 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
|