cleanup: 3 tracked .bak files, 1 stale log, doc updates
build-system / Unit tests (120 cases, <1s) (push) Has been cancelled
build-system / Lint build system (offline, no network) (push) Has been cancelled
build-system / Lint build system (full, with network) (push) Has been cancelled
build-system / Lint recipes (R1/R2 policy, every PR) (push) Has been cancelled
build-system / Migration dry-run (C-7 smoke test) (push) Has been cancelled
build-system / Scratch rebuild dry-run (build-system improvement (push) Has been cancelled
build-system / Lint build system (aggregate, all offline-safe targets) (push) Has been cancelled
build-system / Lint docs (no legacy build commands) (push) Has been cancelled
build-system / Build redbear-mini (30-45 min) (push) Has been cancelled
build-system / Build redbear-full (60-120 min) (push) Has been cancelled
build-system / Smoke test (QEMU boot, nightly) (push) Has been cancelled
build-system / Unit tests (120 cases, <1s) (push) Has been cancelled
build-system / Lint build system (offline, no network) (push) Has been cancelled
build-system / Lint build system (full, with network) (push) Has been cancelled
build-system / Lint recipes (R1/R2 policy, every PR) (push) Has been cancelled
build-system / Migration dry-run (C-7 smoke test) (push) Has been cancelled
build-system / Scratch rebuild dry-run (build-system improvement (push) Has been cancelled
build-system / Lint build system (aggregate, all offline-safe targets) (push) Has been cancelled
build-system / Lint docs (no legacy build commands) (push) Has been cancelled
build-system / Build redbear-mini (30-45 min) (push) Has been cancelled
build-system / Build redbear-full (60-120 min) (push) Has been cancelled
build-system / Smoke test (QEMU boot, nightly) (push) Has been cancelled
`qemu-debug-boot.log` (1.7 MB, May 20) — stale
debug log from a QEMU session 1+ month ago, removed
from working tree (untracked, in repo root).
`local/recipes/dev/bison/source/doc/bison.info.bak`
(16 KB) — emacs/autotools backup file that got
tracked by accident. Removed from git tracking.
`local/recipes/wayland/libwayland/recipe.toml.bak`
(22 lines) — backup of libwayland recipe from the
C-1 fix (libwayland `patches = [redox.patch]` line
removal). The actual fix is in the working tree;
the .bak was stale.
`recipes/libs/ncurses/recipe.toml.bak` (34 lines) —
backup of ncurses recipe from an earlier session.
Stale.
.local/docs/C7-STATUS.md:
- Updated commit list with 5 commits not previously
listed: ffbbf4935c (lint carveout), d2c982dc2a
(broken patches refs), f1802f6f2b (qtbase NO-OP
seds), a123bf1c5d (sddm migration), a399e7da08
(stale tracked files)
- Final lint state: 0 errors / 173 recipes clean
(was '10 remaining errors' in the previous version)
- Stale tracked files section: documents the
a399e7da08 cleanup (617 files / 1.3M lines removed)
- Next steps: C-8 deferred with explicit user note
'DO NOT clean up unzipped sources — they may
contain the user's in-flight WIP build state'
This commit is contained in:
@@ -50,6 +50,15 @@ local/firmware/
|
||||
*.lock
|
||||
!local/recipes/system/cub/source/Cargo.lock
|
||||
|
||||
# Editor backup files (emacs ~, vim .swp, vim .swo)
|
||||
# Autotools regen produces these in source/ dirs. They
|
||||
# are not part of the upstream source and get regenerated
|
||||
# on the next `repo cook`. Prevents future accidental
|
||||
# commits of these ephemeral files.
|
||||
*~
|
||||
.*.swp
|
||||
.*.swo
|
||||
|
||||
# Internal tooling
|
||||
.sisyphus/
|
||||
TASK_COMPLETION_SUMMARY.md
|
||||
|
||||
+55
-8
@@ -148,6 +148,12 @@ All 24 KF6 patches:
|
||||
| `4243beb4a` | test-edit-kf6-recipes: 11 unit tests |
|
||||
| `e3e1faece` | test-cookbook-apply-patches-e2e: 4 integration tests |
|
||||
| `2357758ef` | postmortem: mark C-7 complete, C-8 ready |
|
||||
| `d5def6a67d` | docs: C7-STATUS.md |
|
||||
| `ffbbf4935c` | C-7 cleanup: lint-recipe 13 → 4 errors (R2 build-time carveout) |
|
||||
| `d2c982dc2a` | fix: remove broken patches = [...] refs |
|
||||
| `f1802f6f2b` | qtbase: remove NO-OP seds (lint-recipe 1 → 1) |
|
||||
| `a123bf1c5d` | sddm: 19 sed chains migrated (lint-recipe 1 → 0) |
|
||||
| `a399e7da08` | cleanup: remove stale tracked files (1.3M lines) |
|
||||
|
||||
## What this enables
|
||||
|
||||
@@ -169,6 +175,48 @@ All 24 KF6 patches:
|
||||
successful cook) don't fail with "patch already applied"
|
||||
— the helper detects and skips.
|
||||
|
||||
## Final lint state (post-C-7)
|
||||
|
||||
`make lint-recipe` is **0 errors / 173 recipes clean** as of
|
||||
`a123bf1c5d` (sddm migration) — the last remaining 2 R2
|
||||
errors (sddm 19 seds, qtbase 2 seds) were both addressed
|
||||
in the lint cleanup commits `f1802f6f2b` (qtbase NO-OP
|
||||
seds removed) and `a123bf1c5d` (sddm fully migrated).
|
||||
|
||||
The 2 remaining R1 errors (redbear-sessiond, libwayland
|
||||
referencing missing patch files) were fixed in `d2c982dc2a`
|
||||
by removing the broken `patches = [...]` lines.
|
||||
|
||||
The lint rule R2 was also refined in `ffbbf4935c` to
|
||||
distinguish upstream-source seds (`${COOKBOOK_SOURCE}/`)
|
||||
from build-time seds (`${COOKBOOK_STAGE}/`,
|
||||
`${COOKBOOK_BUILD}/`, `${COOKBOOK_SYSROOT}/`). Build-time
|
||||
seds are exempt because they're build-time adjustments to
|
||||
staged artifacts, not upstream source edits.
|
||||
|
||||
## Stale tracked files (commit `a399e7da08`)
|
||||
|
||||
617 tracked files removed (1.3M lines), 0 lines added.
|
||||
Categories of stale tracked files removed:
|
||||
|
||||
- **5 broken self-referential symlinks** in
|
||||
`local/recipes/drivers/{ehcid,ohcid,uhcid,usb-core}/`
|
||||
and `local/recipes/tui/mc/mc` (created by the now-removed
|
||||
apply-patches.sh symlink-overlay system).
|
||||
- **2 broken absolute-path symlinks** in
|
||||
`local/recipes/gpu/drivers/{linux-kpi,redox-driver-sys}/source`
|
||||
(pointed to a different filesystem layout).
|
||||
- **13 tracked `~` files** (emacs backups from autotools regen)
|
||||
in autotools-generated source dirs.
|
||||
- **12 tracked-but-missing upstream WIP recipes**
|
||||
(596 files) in `recipes/wip/` that no longer exist on disk.
|
||||
- **4 files in top-level `gparted-git/`** (orphan staging dir).
|
||||
- **1 tracked blob conflict** at `recipes/gpu/drivers`.
|
||||
|
||||
`.gitignore` was extended with `*~`, `.*.swp`, `.*.swo`
|
||||
patterns to prevent future accidental commits of ephemeral
|
||||
editor / autotools-regen files.
|
||||
|
||||
## Next steps (not C-7 anymore)
|
||||
|
||||
1. **C-8**: Delete extracted `source/` trees (5.4 GB) and
|
||||
@@ -176,16 +224,15 @@ All 24 KF6 patches:
|
||||
being built. The `local/recipes/**/source/` and
|
||||
`local/recipes/**/source.tar` patterns are already in
|
||||
`.gitignore` so deleting them is safe; the cookbook re-
|
||||
extracts on next fetch.
|
||||
extracts on next fetch. **User note (2026-06-13): DO NOT
|
||||
clean up unzipped sources — they may contain the user's
|
||||
in-flight WIP build state.** This is deferred until the
|
||||
user's WIP is committed or discarded.
|
||||
|
||||
2. **`make lint-recipe` cleanup**: 10 remaining errors for
|
||||
non-KF6 recipes (bison, m4, rust-native, sddm,
|
||||
qt6-wayland-smoke, libwayland, redbear-sessiond). Each
|
||||
needs its own migration or in-tree fork decision.
|
||||
|
||||
3. **Real cook verification**: cook one of the migrated
|
||||
2. **Real cook verification**: cook one of the migrated
|
||||
recipes (e.g. `kf6-karchive`) end-to-end and verify
|
||||
`stage.pkgar` byte-identical to the inline-sed version.
|
||||
This proves the migration preserves the exact build
|
||||
artifact. Blocked on toolchain infrastructure issues
|
||||
unrelated to C-7.
|
||||
unrelated to C-7 (libtoolize path bug, missing libffi
|
||||
source, libiconv autotools chain).
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,22 +0,0 @@
|
||||
#TODO: Requires Redox compatibility patching for missing Linux header paths and
|
||||
# some POSIX/Linux-only flags during cross-builds.
|
||||
# redox.patch restores the Redox compatibility stubs plus Meson scanner detection.
|
||||
[source]
|
||||
tar = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.24.0/downloads/wayland-1.24.0.tar.xz"
|
||||
patches = ["redox.patch"]
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
dependencies = [
|
||||
"relibc",
|
||||
"libffi",
|
||||
"expat",
|
||||
"libxml2",
|
||||
]
|
||||
script = """
|
||||
DYNAMIC_INIT
|
||||
cookbook_meson -Ddocumentation=false -Dtests=false -Ddtd_validation=false -Dc_args=-Wno-error
|
||||
"""
|
||||
|
||||
[package]
|
||||
dependencies = ["libffi"]
|
||||
@@ -1,34 +0,0 @@
|
||||
[source]
|
||||
tar = "https://ftp.gnu.org/gnu/ncurses/ncurses-6.6.tar.gz"
|
||||
blake3 = "fbec55697a01f99b9cc3f25be55e73ae7091f4c53e5d81a1ea15734c4e5b7238"
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
script = """
|
||||
DYNAMIC_INIT
|
||||
COOKBOOK_CONFIGURE_FLAGS+=(
|
||||
--disable-db-install
|
||||
--disable-stripping
|
||||
--disable-widec
|
||||
--enable-pc-files
|
||||
--without-ada
|
||||
--without-manpages
|
||||
--without-tests
|
||||
--with-terminfo-dirs=/usr/share/terminfo
|
||||
--with-pkg-config-libdir=/usr/lib/pkgconfig
|
||||
cf_cv_func_mkstemp=yes
|
||||
)
|
||||
if [ "${COOKBOOK_DYNAMIC}" == "1" ]
|
||||
then
|
||||
COOKBOOK_CONFIGURE_FLAGS+=(--with-shared)
|
||||
fi
|
||||
cookbook_configure
|
||||
"""
|
||||
|
||||
[package]
|
||||
dependencies = [
|
||||
"terminfo",
|
||||
]
|
||||
Reference in New Issue
Block a user