vasilito
f02504b863
version = "0.2.189" -> "0.2.189+rb0.3.2", per local/AGENTS.md "Version conventions": every Cat 2 fork is <upstream>+rb<branch>. The label is what makes the fork traceable to both its upstream base and the Red Bear branch it was built for. +rb is build metadata, which semver ignores when matching, so ^0.2 requirements still resolve to the fork -- confirmed, the rust lockfile now reads libc v0.2.189+rb0.3.2 from the path source. A -rb suffix would be read as a pre-release and would NOT satisfy them, which is exactly why the project mandates +rb. Two things this surfaced: - fork-upstream-map: libc moved from snapshot to diverged. The fork is vendored from the crates.io PACKAGE, whose file set differs from the upstream git tag by construction (no .github/, adds .cargo_vcs_info.json), so a tag content-diff reported differences that mean nothing -- 'missing files that exist in upstream' for files the package never ships. diverged states the real relationship. - local/recipes/dev/gcc16/.vendored-upstream added. Extracting GCC 16.1.0 put upstream's vendored Rust crates under local/recipes/*/source/, so sync-versions.sh treated datafrog/log/polonius-engine as Cat 1 in-house crates and wanted to stamp them 0.3.2. The marker is the documented escape hatch (BUILD-SYSTEM.md section 7). Both gates clean: verify-fork-versions reports no violations, sync-versions --check reports no gcc16 drift.
48 lines
3.3 KiB
TOML
48 lines
3.3 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
|
|
# Vendored from the crates.io registry (unrelated git history -> snapshot).
|
|
# Divergence is confined to src/unix/redox/mod.rs, which exposes the waitid
|
|
# surface relibc already implements and the libc crate still omits as of
|
|
# 0.2.189. TEMPORARY: drop this fork once upstream libc carries the Redox
|
|
# bindings. See local/docs/VENDORED-LIBC-FORK.md.
|
|
libc https://github.com/rust-lang/libc.git 0.2.189 diverged # vendored from the crates.io PACKAGE, whose file set differs from the git tag by construction (no .github/, adds .cargo_vcs_info.json), so a tag content-diff is meaningless; divergence is confined to src/unix/redox/mod.rs
|