From 885e3390371adb3174afdb0116417ddb150638e2 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 4 Oct 2026 19:22:04 -0400 Subject: [PATCH] Drop superseded T2 firmware handling from the install script --- install/hardware/apple/fix-t2.sh | 6 ------ test/shell.d/t2-hardware-test.sh | 6 ------ 2 files changed, 12 deletions(-) diff --git a/install/hardware/apple/fix-t2.sh b/install/hardware/apple/fix-t2.sh index ea15af3a..90d4a7df 100644 --- a/install/hardware/apple/fix-t2.sh +++ b/install/hardware/apple/fix-t2.sh @@ -3,12 +3,6 @@ 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 diff --git a/test/shell.d/t2-hardware-test.sh b/test/shell.d/t2-hardware-test.sh index c7cf388b..850f37c5 100644 --- a/test/shell.d/t2-hardware-test.sh +++ b/test/shell.d/t2-hardware-test.sh @@ -22,14 +22,8 @@ grep -Fq 'KERNEL_CMDLINE[default]+=" intel_iommu=on iommu=pt pm_async=off mem_sl 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)