Repository navigation
Conversation
applespi is mainlined, so macbook12-spi-driver-dkms cannot build on modern kernels (its include was removed in 6.12) and its build fails on every kernel update once linux-headers is present. The in-tree module is what the initramfs drop-in loads, so only that needs to stay.
install/omarchy-other.packages exists so the ISO holds the packages install scripts reach for. Nothing reaches for this one now, so the entry only pins an AUR package that cannot build, the way the T2 change dropped tiny-dfr. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
Reviewed by Claude Opus 5 in Claude Code, with an independent second opinion from Codex at xhigh reasoning. Tests ran on a disposable Omarchy 4.0.0 worker VM (kernel 7.1.9-arch1-2), never on the machine holding credentials. The question that decides this one is what a matched MacBook uses for its keyboard and trackpad once the package is gone, and the in-tree path is there. On the worker: One module for both the keyboard and the touchpad, shipped by the The package also carried Pushed one commit, Still open, and a decision for the maintainer rather than mine to push: removing the install line does not uninstall anything. Every MacBook that already ran the old installer keeps the package and keeps hitting the failed build the moment Tests on the worker: Codex agreed with both points above, which I had already reached, so its independence is not currently guaranteed; it contributed the |
fix-spi-keyboard.sh no longer installs it and the ISO no longer caches it, but every MacBook that ran the old installer still carries a package whose build fails on every kernel update once linux-headers is present. The migration removes it idempotently, as the tiny-dfr migration does.
|
Thanks for the review and the ISO fix; caching a package nothing installs was the right catch. I completed the migration half: migrations/1788476400.sh drops macbook12-spi-driver-dkms idempotently when present, following the tiny-dfr precedent, so machines that ran the old installer stop hitting the failed build the moment linux-headers arrives. spi-keyboard-test.sh now covers the drop and its idempotence; the ISO assertion you added is in place. |
|
Re-reviewed at The migration is correct and I pushed nothing. It is the half I left open last time, and the three things that could have made it dangerous all check out. No machine loses its keyboard at the LUKS prompt. There has never been a released revision that installed the package without also writing the drop-in: The migration actually reaches the machines in #9831.
Two notes, neither worth a commit:
Tests, all on the worker: Codex reviewed the same head at xhigh and found no defect, agreeing with conclusions I had already reached, so its independence is not currently guaranteed here — read-only sandboxing restricts writes and not reads. It contributed the mkinitcpio hook mechanism, which I had reasoned about wrongly and then checked on the worker. One claim of its I rejected: that Two other open PRs edit Also related: #10154 does not interact with this. It is Nothing pushed. Waiting on the maintainer, for how this sequences against #10141. |
quattro replaced linux, linux-headers and linux-ptl with linux-omarchy and its headers in the ISO package list, beside the line this branch removes. The resolution keeps quattro's kernels and still drops macbook12-spi-driver-dkms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
quattro's default kernel is now linux-omarchy, which carries applespi as a module (CONFIG_KEYBOARD_APPLESPI=m), so naming the linux package was no longer true of most machines. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Re-reviewed against today's
Your migration does what it says on a real system. On that same worker, with the broken package installed, Pushed:
Tests on the worker at Codex found no defect at this head. Asked separately which of this PR and #10141 better fixes the obsolete package, it chose this one, as I had. #10141 still installs the package whenever its Waiting on the maintainer: whether to take this or #10141's handling of the package line. #10141 would need its |
[Medium impact] The PR appears safe to merge; the remaining test coverage concern is non-blocking. Findings
SummaryStops installing the obsolete MacBook SPI DKMS package while keeping the existing initramfs setup.
Reviews (4) · Last reviewed commit: "Drop the redundant presence check from t..." · Reviewed by Greptile |
| # obsolete — applespi is in-tree and the out-of-tree copy cannot build on | ||
| # modern kernels — so it must not be installed anymore. | ||
| run_leaf "MacBookPro14,1" | ||
| [[ -s $tmp_dir/pkg-add.log ]] && |
There was a problem hiding this comment.
MacBook8,1 path lacks coverage
This test checks only MacBookPro14,1, but MacBook8,1 uses a different required module list. Add a matched MacBook8,1 case that checks its initramfs drop-in and confirms the DKMS package is not requested. Without it, a regression in that LUKS-keyboard path could go unnoticed.
quattro added its own test/shell.d/spi-keyboard-test.sh in omacom#14431, covering a missing or unreadable DMI product name under errexit and pinning that a matched Intel Mac installs macbook12-spi-driver-dkms. The resolution keeps this branch's test, runs the leaf under bash -eE as quattro's does, and carries the missing/unreadable DMI cases over. The pin is dropped, since not installing the package is what this branch changes and its own assertion says the opposite. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Re-reviewed by Claude Opus 5.5 in Claude Code, with a second opinion from Codex at medium effort. Everything executable ran on a disposable Omarchy worker VM (kernel Pushed Still a live bug at this head. On the worker, Tests on the worker at Codex reviewed the merge and the full diff at this head and found no defect. It agreed with conclusions I had already reached, so its independence is not guaranteed. It did check two things for itself: that the DMI block fails without the guard, and that #10141 is still open and still handles the same package line differently: it keeps the install behind an in-tree Waiting on the maintainer: the choice between this and #10141, and a green suite on |
quattro folded the per-quirk hardware tests into the table-driven hardware-quirks-test.sh and dropped migration tests, so the standalone spi-keyboard-test.sh goes and the SPI keyboard rows in the table now expect the drop-in without the DKMS package. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
omarchy-pkg-drop already ignores packages that are not installed, and AGENTS.md asks for the drop helper alone where it suffices. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Re-reviewed by Claude Opus 5.5 in Claude Code, with a second opinion from Codex at medium effort and muse-wonder (via pi, thinking high). Everything executable ran on a disposable Omarchy worker VM with Pushed Pushed Still a live bug at this head. On the worker, installing Tests on the worker at Second opinion. Both reviewers found the delta correct and nothing else defective at this head. Codex raised one concern, which I dismissed: the package also carries the T1 Touch Bar and ambient-light drivers for MacBookPro13,2/13,3 and 14,2/14,3, and the migration removes them. Those drivers are the files whose build fails above, so no working module is being taken away, and Related. #10141 still handles the same install line differently, keeping the package behind an in-tree Waiting on the author: @hudsonwa, the description no longer matches the diff. It says the removal migration was left out, but the branch now ships |
|
Hardware datapoint from a MacBook8,1 (Early 2015) running Omarchy edge on kernel
This is a real-device validation of the in-tree SPI driver route, not a test of this PR branch itself. My integration PoC is here: https://github.com/geeknees/omarchy/tree/macbook81/poc-2026-11 I support removing the obsolete SPI DKMS dependency while retaining the early in-tree modules for LUKS input. |
Fixes #9831
What broke
install/hardware/apple/fix-spi-keyboard.shinstallsmacbook12-spi-driver-dkmson every MacBook it matches. That package is obsolete:applespiis mainlined (it ships in thelinuxpackage), and the out-of-tree copy includesasm/unaligned.h, which was removed in kernel 6.12. The DKMS build therefore fails on every kernel update oncelinux-headersis present (reproduced in the issue with the full build log). The failure is currently invisible on stock installs only because Arch's DKMS hook finds nousr/lib/modules/*/buildwithout headers; issue #8285 proposes installinglinux-headers, which would surface this failed build on every matched MacBook.The keyboard itself is unaffected: the script also writes
/etc/mkinitcpio.conf.d/macbook_spi_modules.conf, which loads the in-treeapplespimodule into the initramfs. That half is load-bearing (LUKS passphrase entry), and the issue verifies removing only the package leaves the keyboard and touchpad working.Fix
Drop the
omarchy-pkg-add macbook12-spi-driver-dkmsline and keep everything else, with a comment recording why the package no longer belongs. The initramfs drop-in is unchanged, so initramfs behavior is identical.Why install/hardware
This is an install-time hardware leaf run via
run_loggedfrominstall/hardware/all.sh. The package install belongs there (or nowhere), and the drop-in must stay there, so the fix is confined to the one file.Tests
New
test/shell.d/spi-keyboard-test.shruns a sandboxed copy of the leaf (DMI path and mkinitcpio dir rewritten, stubbedomarchy-pkg-add/sudo):All pass here; the test fails against the pre-fix leaf (RED to GREEN). Honest host note: this machine cannot run a real pre-T2 MacBook, so the model regex is covered by the sandbox rather than hardware; the match set itself is unchanged.
Not included
A migration that removes the package from already-installed machines was left out deliberately (machine-wide package removal is the maintainers' call; the script fix prevents new installs). Happy to add one if wanted. This also removes the regression #8285 would have surfaced.