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

brush: vendor as a local fork (path=source) to stop upstream auto-bump

Browse Source 
The brush recipe used an UNPINNED `git = "https://github.com/reubeno/brush"`
source, so cookbook's fetch silently re-synced it to the latest upstream `main`
on every build. It drifted onto reubeno/brush e985399 (PR #1249, which rewrote
`read_input_line`), which made the Redox port patches reject; the patch-dirtied
clone then failed cookbook's `git checkout` in the fetch step ("local changes
would be overwritten") — surfacing as "brush does not compile".

Vendor the working tree in-repo (RedBear convention: `[source] path = "source"`,
as amdgpu/redox-drm/ext4d use) at reubeno/brush @ 897b373e — the commit right
before #1249, where all four Redox patches (nix-0.31, libc-0.2, brush umask,
brush runtime/input) apply cleanly. The shell is now a local fork under our
control and can never auto-drift again. The brush-source patches are pre-applied
in the vendored tree; the recipe keeps them (apply_patch idempotently skips an
already-applied patch, so the source is never re-dirtied) as reviewable records
of the Redox changes, and still applies the nix/libc patches to the fetched
registry crates.

Verified: `cook brush - successful` in a mini build.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
vasilito
2026-07-26 23:31:19 +09:00
parent 0a0402b955
commit 0383dcbca3
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/recipes/shells/brush/recipe.toml
+9 -1
View File
@@ -3,7 +3,15 @@ name = "brush"
version = "0.1.0"
[source]
git = "https://github.com/reubeno/brush"
# Vendored local fork. brush was an UNPINNED upstream git source, so cookbook's
# fetch silently auto-bumped it to the latest reubeno/brush `main` on every
# build. That broke the Redox port whenever upstream refactored a patched region
# (e.g. read_input_line in PR #1249, commit e985399), because the patches then
# rejected. Vendoring the tree here pins the shell under our control so it never
# drifts again. Snapshot: reubeno/brush @ 897b373e08279f644438fb19438f156fc34647cd
# (the commit right before #1249, where all Redox patches apply cleanly).
# Upstream: https://github.com/reubeno/brush
path = "source"
[build]
template = "custom"