From 4a440131d9b0a88ab042a0ebd2cf669d313f759c Mon Sep 17 00:00:00 2001 From: vasilito Date: Sun, 12 Jul 2026 10:22:00 +0300 Subject: [PATCH] phase 5.6: update PATCH-PRESERVATION-AUDIT + README for Round 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the audit doc to reflect Round 6 (Phase 5) outcomes: - 122 active patches (was 119 in Round 5) - Cumulative: 6 patches re-extracted from legacy-absorbed for test recipes (Phase 5.2: relibc-tests/recipe.toml and relibc-tests-bins/recipe.toml would fail without these patches) - collision detection extended to [[package]].files (Phase 5.1) - 8 regression tests added (Phase 5.4) - base-fork push deadlock helper created (Phase 5.3) Updates README.md Documentation list to point at: - HOOKS.md (Phase 4.5) - fork-push-status/ (Phase 4.1/5.3) The PATCH-PRESERVATION-AUDIT cumulative reduction table extended: After Phase 5.2: 122 patches, 0 orphans (0%) — Round 6 Out-of-scope for Phase 1/2/3/4/5: - base fork push STILL DEADLOCKED (Phase 5.3 added operator-side helper at local/scripts/unblock-base-push.sh with 3 paths) - Collision detection extension #4 marked DONE in Phase 5.1 --- README.md | 4 ++- .../PATCH-PRESERVATION-AUDIT-2026-07-12.md | 31 ++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 91dbeb461c..d41c27e47a 100644 --- a/README.md +++ b/README.md @@ -203,8 +203,10 @@ Red Bear OS operates under strict discipline. Full policies: [`local/AGENTS.md`] - [Greeter & Login](local/docs/GREETER-LOGIN-IMPLEMENTATION-PLAN.md) — Native greeter, auth daemon, session launch - [DRM Modernization](local/docs/DRM-MODERNIZATION-EXECUTION-PLAN.md) — DRM/KMS display and render maturity - [USB Plan](local/docs/USB-IMPLEMENTATION-PLAN.md) — USB stack design and implementation -- [Patch Preservation Audit](local/docs/PATCH-PRESERVATION-AUDIT-2026-07-12.md) — orphan-patch governance, Round 1-3 audit results, SUPERSEDED.md log +- [Patch Preservation Audit](local/docs/PATCH-PRESERVATION-AUDIT-2026-07-12.md) — orphan-patch governance, Rounds 1-6 audit results, SUPERSEDED.md log - [Collision Detection Status](local/docs/COLLISION-DETECTION-STATUS.md) — runtime collision-detection current state +- [Hooks](local/docs/HOOKS.md) — opt-in git hooks (pre-push safety net, etc.) +- [Fork Push Status](local/docs/fork-push-status/2026-07-12-Round-5-phase-4.1.md) — fork-branch push results + base deadlock - [Wi‑Fi Plan](local/docs/WIFI-IMPLEMENTATION-PLAN.md) — Wireless architecture and driver plan - [Bluetooth Plan](local/docs/BLUETOOTH-IMPLEMENTATION-PLAN.md) — Bluetooth stack design - [Build Cache](local/docs/BUILD-CACHE-PLAN.md) — Content-hash (BLAKE3) build cache system diff --git a/local/docs/PATCH-PRESERVATION-AUDIT-2026-07-12.md b/local/docs/PATCH-PRESERVATION-AUDIT-2026-07-12.md index 3a6e5a74f0..8b6201d94f 100644 --- a/local/docs/PATCH-PRESERVATION-AUDIT-2026-07-12.md +++ b/local/docs/PATCH-PRESERVATION-AUDIT-2026-07-12.md @@ -265,13 +265,19 @@ Three follow-on improvements after Round 3 closed: After Phase 2.1: 182 patches, 27 orphans (15%) — archived 69 After Phase 3.0-3.2: 121 patches, 0 orphans (0%) — Round 3 After Phase 4.3: 119 patches, 0 orphans (0%) — Round 5 + After Phase 5.2: 122 patches, 0 orphans (0%) — Round 6 Cumulative work to date: 132 patches archived as SUPERSEDED or -INTEGRATED, 5 files cleaned up, 6 fork branches advanced to origin. -Build system now has 100% patch preservation + 6 forks on origin -with current Round 0-4 work. +INTEGRATED, 5 files cleaned up, 6 fork branches advanced to origin, +6 patches re-extracted from legacy-absorbed for test-recipe +references (Round 6 Phase 5.2), collision detection extended to +`[[package]].files` field (Phase 5.1) with 8 regression tests +(Phase 5.4), operator-side base-push-unblock helper (Phase 5.3). +Build system now has 100% patch preservation + collision detection ++ 4-check pre-push hook + operator-side fixes for the base-push +deadlock. -## Out-of-scope for Phase 1/2/3/4 (forward work) +## Out-of-scope for Phase 1/2/3/4/5 (forward work) 1. **bootloader fork rebase** — fork at `2f79630` is 927 files vs upstream 1.0.0's 77 files. Defer to `upgrade-forks.sh bootloader` @@ -281,19 +287,20 @@ with current Round 0-4 work. as SUPERSEDED in Round 3 (file-restructured). The work landed via the 0.6.0 upstream converge. No follow-up needed. -3. **base fork push to origin** — DEADLOCKED at end of Round 5 - (Phase 4.1). gitea server's `receive.shallowUpdate=true` blocks +3. **base fork push to origin** — STILL DEADLOCKED as of Round 6 + (Phase 5.3). gitea server's `receive.shallowUpdate=true` blocks the base force-push. Local has 2569 ahead / 190 behind. Operator- side fix: disable `receive.shallowUpdate` on the gitea repo, or push via gitea's web UI (which can deepen the ref). Per - `local/docs/fork-push-status/2026-07-12-Round-5-phase-4.1.md`. + `local/scripts/unblock-base-push.sh` (Round 6) which provides + 3 documented operator-side paths. 4. **Collision detection extension** (Phase 4.2+ forward work): - - Currently only checks `[[package]].installs` paths, not - `[[package]].files` (different field) - - Doesn't trace dynamic file generation (e.g., base's initfs generator) - - Future: extend `verify-collision-detection.py` to also read - `[[package]].files` paths and trace installer source for + - **DONE in Phase 5.1**: now reads `[[package]].files` field as + well as `[[package]].installs`. 39 recipes use the `.files` form + (e.g. all the Round 3 system drivers). + - Still doesn't trace dynamic file generation (e.g., base's + initfs generator). Future: trace installer source for generated paths. See `local/docs/COLLISION-DETECTION-STATUS.md`. 5. **Pre-receive server-side hook** (Phase 4.5+ forward work):