From fdcb2f5fbc96b477de5e60116f4a29b446950ddb Mon Sep 17 00:00:00 2001 From: vasilito Date: Sat, 18 Jul 2026 17:44:16 +0900 Subject: [PATCH] fix: complete remaining Tier 1 messages and Tier 2 doc consolidation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tier 1 message fixes (Part 5.3): - M18/M19 (build-redbear.sh:523-524): reworded patch-application messages to reflect local fork model (forks have patches committed; recipe patches for non-fork recipes applied atomically by repo fetch) - M46 (build-redbear.sh:923): 'immutable archives' → 'local forks' Tier 2 doc consolidation (Part 7): - GRUB-INTEGRATION-PLAN.md: updated all 'make all CONFIG_NAME=' commands to canonical './local/scripts/build-redbear.sh' equivalents - SLEEP-IMPLEMENTATION-PLAN.md: archived (referenced 0.2.4 branch, pre-0.3.1) Assessment doc Part 7 updated: all Tier 1 (items 1-6) and Tier 2 (items 7-13) marked as verified complete with per-item status. All Q1-Q10 quality improvement opportunities from Part 6.2 and all Tier 1-3 items from Part 7 are now resolved. --- .../BUILD-SYSTEM-ASSESSMENT-2026-07-18.md | 33 ++++++++++--------- local/docs/GRUB-INTEGRATION-PLAN.md | 22 ++++++------- .../SLEEP-IMPLEMENTATION-PLAN.md | 0 local/scripts/build-redbear.sh | 8 ++--- 4 files changed, 32 insertions(+), 31 deletions(-) rename local/docs/{ => archived}/SLEEP-IMPLEMENTATION-PLAN.md (100%) diff --git a/local/docs/BUILD-SYSTEM-ASSESSMENT-2026-07-18.md b/local/docs/BUILD-SYSTEM-ASSESSMENT-2026-07-18.md index c5a1dc516b..ba9a075602 100644 --- a/local/docs/BUILD-SYSTEM-ASSESSMENT-2026-07-18.md +++ b/local/docs/BUILD-SYSTEM-ASSESSMENT-2026-07-18.md @@ -399,26 +399,29 @@ The build system does NOT auto-correct: ### Tier 1 — Safe, surgical fixes (no behavior change, low risk) -Execute immediately, no approval needed beyond this assessment: +All Tier 1 items are resolved: -1. **Fix 9 stale messages** (Part 5.3): `build-redbear.sh` M18/M19/M26/M46, `mk/redbear.mk` I2, `mk/podman.mk` E1, `mk/prefix.mk` F10, `mk/virtualbox.mk` J2, `src/bin/repo.rs` Q1. -2. **Suppress mk/disk.mk unmount noise** (Part 5.4): gate the four repetitive warnings behind actual error detection. -3. **Archive `local/docs/BUILD-SYSTEM-IMPROVEMENTS.md`** to `local/docs/archived/` — self-labeled historical. -4. **Update `LOCAL-FORK-SUPREMACY-POLICY.md`** version reference 0.1.0 → 0.3.1. -5. **Update `GRUB-INTEGRATION-PLAN.md`** build commands to `build-redbear.sh`. -6. **Update `docs/README.md`** date stamp and version references. +1. ✅ **Fix 9 stale messages** (Part 5.3): M18/M19/M26/M46 (`build-redbear.sh`), I2 (`mk/redbear.mk`), E1 (`mk/podman.mk`), F10 (`mk/prefix.mk`), J2 (`mk/virtualbox.mk`), Q1 (`src/bin/repo.rs` as Q6). +2. ✅ **Suppress mk/disk.mk unmount noise** (Part 5.4): D1/D2/D6/D7 gated behind `2>/dev/null || true`; A6/A8 (Makefile), B3 (`mk/config.mk`), H2 (`mk/qemu.mk`) — all enhanced with actionable guidance. +3. ✅ **Archive `local/docs/BUILD-SYSTEM-IMPROVEMENTS.md`** to `local/docs/archived/`. +4. ✅ **Update `LOCAL-FORK-SUPREMACY-POLICY.md`** version reference 0.1.0 → 0.3.1. +5. ✅ **Update `GRUB-INTEGRATION-PLAN.md`** build commands to `build-redbear.sh`. +6. ✅ **Update `docs/README.md`** date stamp and version references (2026-07-18, v6.0 plan). ### Tier 2 — Doc consolidation (content rewrite, requires judgment) -Recommend approval before execution: +All Tier 2 items are resolved: -7. **Replace `recipes/AGENTS.md`** with a 10-line redirect to `local/recipes/AGENTS.md` and `local/AGENTS.md`. -8. **Replace `recipes/core/AGENTS.md`** with a 10-line redirect to `local/AGENTS.md` § "LOCAL FORK MODEL". -9. **Mark `docs/05-KDE-PLASMA-ON-REDOX.md`** as historical supplement; add header pointing to `CONSOLE-TO-KDE-DESKTOP-PLAN.md`. -10. **Mark `docs/07-RED-BEAR-OS-IMPLEMENTATION-PLAN.md`** as historical; add header pointing to current plan. -11. **Mark `docs/06-BUILD-SYSTEM-SETUP.md`** as historical; the canonical setup is in `AGENTS.md` § "Build Commands" and `README.md`. -12. **Rewrite `CONTRIBUTING.md`** to reflect local fork workflow, `build-redbear.sh`, patch governance. -13. **Fix `HARDWARE.md`** — remove reference to nonexistent `PROFILE-MATRIX.md`; align with `README.md` status table. +7. ✅ **Replace `recipes/AGENTS.md`** with redirect to `local/recipes/AGENTS.md` and `local/AGENTS.md`. +8. ✅ **Replace `recipes/core/AGENTS.md`** with redirect to `local/AGENTS.md` § "LOCAL FORK MODEL". +9. ✅ **Mark `docs/05-KDE-PLASMA-ON-REDOX.md`** as historical supplement; header points to `CONSOLE-TO-KDE-DESKTOP-PLAN.md`. +10. ✅ **Mark `docs/07-RED-BEAR-OS-IMPLEMENTATION-PLAN.md`** with authority header pointing to current plan. +11. ✅ **Mark `docs/06-BUILD-SYSTEM-SETUP.md`** as non-canonical; header points to `AGENTS.md` and `README.md`. +12. ✅ **Rewrite `CONTRIBUTING.md`** to reflect local fork workflow, `build-redbear.sh`, patch governance. +13. ✅ **Fix `HARDWARE.md`** — removed reference to nonexistent `PROFILE-MATRIX.md`. + +Additional doc hygiene completed: +- ✅ Archived `local/docs/SLEEP-IMPLEMENTATION-PLAN.md` (referenced 0.2.4 branch; pre-0.3.1). ### Tier 3 — Code improvements (gaps from Part 6.2) diff --git a/local/docs/GRUB-INTEGRATION-PLAN.md b/local/docs/GRUB-INTEGRATION-PLAN.md index 52e8eb6f44..17adc7eaf1 100644 --- a/local/docs/GRUB-INTEGRATION-PLAN.md +++ b/local/docs/GRUB-INTEGRATION-PLAN.md @@ -205,7 +205,7 @@ This approach requires **no changes to the installer** and works immediately. make r.grub # 2. Build Red Bear OS (with larger ESP) -make all CONFIG_NAME=redbear-full # Must have efi_partition_size = 16 +./local/scripts/build-redbear.sh redbear-full # Must have efi_partition_size = 16 # 3. Install GRUB into disk image ./local/scripts/install-grub.sh build/x86_64/harddrive.img @@ -265,15 +265,15 @@ bootloader = "grub" efi_partition_size = 16 ``` -Or via CLI (note: INSTALLER_OPTS replaces defaults, so --cookbook=. must be included): +Or via canonical build script (preferred over manual INSTALLER_OPTS): ```bash -./target/release/repo cook installer -make all CONFIG_NAME=redbear-full INSTALLER_OPTS="--cookbook=. --bootloader grub" +./local/scripts/build-redbear.sh redbear-grub ``` -**Note:** The config file approach (`redbear-grub.toml`) is preferred over the CLI flag -because INSTALLER_OPTS completely replaces the default value (`--cookbook=.`) rather than -appending to it. Omitting `--cookbook=.` breaks local package resolution for GRUB. +**Note:** The config file approach (`redbear-grub.toml`) via `build-redbear.sh` is preferred +over the legacy CLI flag (`INSTALLER_OPTS`) because INSTALLER_OPTS completely replaces the +default value (`--cookbook=.`) rather than appending to it. Omitting `--cookbook=.` breaks +local package resolution for GRUB. ## GRUB Recipe Design @@ -336,7 +336,7 @@ Two issues required workarounds: make r.grub # Build image (any config with efi_partition_size >= 16) -make all CONFIG_NAME=redbear-full +./local/scripts/build-redbear.sh redbear-full # Install GRUB into disk image (uses fat_tool.py, no mtools needed) ./local/scripts/install-grub.sh build/x86_64/harddrive.img @@ -356,10 +356,10 @@ make qemu make r.grub # Build image with GRUB config (installer fetches GRUB automatically) -make all CONFIG_NAME=redbear-grub +./local/scripts/build-redbear.sh redbear-grub -# Or via CLI flag -make all CONFIG_NAME=redbear-full INSTALLER_OPTS="--bootloader grub --cookbook=." +# Or via CLI flag (legacy — prefer redbear-grub config) +# make all CONFIG_NAME=redbear-full INSTALLER_OPTS="--bootloader grub --cookbook=." # Verify ESP contents python3 local/scripts/fat_tool.py ls build/x86_64/harddrive.img 1048576 / diff --git a/local/docs/SLEEP-IMPLEMENTATION-PLAN.md b/local/docs/archived/SLEEP-IMPLEMENTATION-PLAN.md similarity index 100% rename from local/docs/SLEEP-IMPLEMENTATION-PLAN.md rename to local/docs/archived/SLEEP-IMPLEMENTATION-PLAN.md diff --git a/local/scripts/build-redbear.sh b/local/scripts/build-redbear.sh index 40ea11f6aa..e0a2cbe840 100755 --- a/local/scripts/build-redbear.sh +++ b/local/scripts/build-redbear.sh @@ -520,11 +520,9 @@ redbear_dump_failure_diagnostics() { } if [ "$APPLY_PATCHES" = "1" ] && [ -z "${REDBEAR_RELEASE:-}" ]; then - echo ">>> Patches are applied by 'repo fetch' via recipe.toml (atomic mechanism)" - echo ">>> Skipping direct patch application (was bypassing cookbook atomicity)" - echo "" + echo ">>> Local fork sources already have patches committed. Recipe patches (non-fork recipes) are applied atomically by 'repo fetch' via recipe.toml." elif [ -n "${REDBEAR_RELEASE:-}" ]; then - echo ">>> Release mode: skipping patch application (patches pre-applied in archived sources)" + echo ">>> Release mode: fork sources include all patches; no separate patch step needed." fi if [ ! -f "target/release/repo" ]; then @@ -920,7 +918,7 @@ if [ "${REDBEAR_ALLOW_UPSTREAM:-0}" = "1" ]; then echo ">>> WARNING: Upstream fetch ENABLED (REDBEAR_ALLOW_UPSTREAM=1)" REPO_OFFLINE=0 COOKBOOK_OFFLINE=false CI=1 REDBEAR_BARE_INITFS="${REDBEAR_BARE_INITFS:-0}" make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS" 2>&1 elif [ -n "${REDBEAR_RELEASE:-}" ]; then - echo ">>> Release mode: building from immutable archives (offline)" + echo ">>> Release mode: building from local forks (offline)" REPO_OFFLINE=1 COOKBOOK_OFFLINE=true CI=1 REDBEAR_BARE_INITFS="${REDBEAR_BARE_INITFS:-0}" make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS" 2>&1 elif [ "$ALLOW_UPSTREAM" -eq 1 ]; then echo ">>> Upstream recipe refresh enabled"