fix(t2): drop the superseded firmware package before adding the fetcher

This commit is contained in:
Søren H. Johansen committed 2026-10-01 19:40:35 +02:00
1 parent aeeacce566
commit 25db463cd9
2 files changed
+21

No files matched your search

+11
View File
@@ -3,6 +3,17 @@
if lspci -nn | grep "106b:180[12]" >/dev/null; then
echo "Detected MacBook with T2 chip. Installing support items..."
# The fetcher replaced the packaged firmware upstream and declares
# Conflicts=apple-bcm-firmware, so a machine that already carries the old
# package (an earlier install) must drop it first or the noninteractive
# transaction fails. Fresh installs have nothing to drop, which is a no-op.
omarchy-pkg-drop apple-bcm-firmware
# apple-bcm-firmware-fetcher reads its firmware off an on-disk macOS volume —
# Wi-Fi firmware for T2 Macs is only legally obtainable from there. A
# single-boot install that wiped macOS has no such volume, so the fetch comes
# up empty; those machines need the firmware supplied from a macOS copy or a
# downloaded recovery image instead.
omarchy-pkg-add \
linux-t2 \
linux-t2-headers \
+10
View File
@@ -20,6 +20,16 @@ grep -Fq 'KERNEL_CMDLINE[default]+=" intel_iommu=on iommu=pt pm_async=off mem_sl
fail "T2 setup leaves optional Touch Bar customization uninstalled"
! grep -qx 'tiny-dfr' "$other_packages" ||
fail "the ISO no longer caches tiny-dfr"
grep -Fq 'apple-bcm-firmware-fetcher' "$fix_t2" ||
fail "T2 setup installs the firmware fetcher"
grep -Fq 'omarchy-pkg-drop apple-bcm-firmware' "$fix_t2" ||
fail "T2 setup drops the superseded firmware package before the fetcher conflicts with it"
! grep -Fq 'apple-bcm-firmware \' "$fix_t2" ||
fail "T2 setup no longer adds the superseded firmware package"
grep -Fq 'apple-bcm-firmware-fetcher' "$other_packages" ||
fail "the default package list installs the firmware fetcher"
! grep -qx 'apple-bcm-firmware' "$other_packages" ||
fail "the default package list no longer names the superseded firmware package"
pass "fresh T2 setup uses t2bce-compatible suspend, fan, and Touch Bar defaults"
test_tmp=$(mktemp -d)