Drop superseded T2 firmware handling from the install script
This commit is contained in:
1 parent
25db463cd9
commit
885e339037
2 files changed
-12
No files matched your search
@@ -3,12 +3,6 @@
|
|||||||
if lspci -nn | grep "106b:180[12]" >/dev/null; then
|
if lspci -nn | grep "106b:180[12]" >/dev/null; then
|
||||||
echo "Detected MacBook with T2 chip. Installing support items..."
|
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 —
|
# 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
|
# 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
|
# single-boot install that wiped macOS has no such volume, so the fetch comes
|
||||||
|
|||||||
@@ -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"
|
fail "the ISO no longer caches tiny-dfr"
|
||||||
grep -Fq 'apple-bcm-firmware-fetcher' "$fix_t2" ||
|
grep -Fq 'apple-bcm-firmware-fetcher' "$fix_t2" ||
|
||||||
fail "T2 setup installs the firmware fetcher"
|
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" ||
|
grep -Fq 'apple-bcm-firmware-fetcher' "$other_packages" ||
|
||||||
fail "the default package list installs the firmware fetcher"
|
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"
|
pass "fresh T2 setup uses t2bce-compatible suspend, fan, and Touch Bar defaults"
|
||||||
|
|
||||||
test_tmp=$(mktemp -d)
|
test_tmp=$(mktemp -d)
|
||||||
|
|||||||
Reference in new issue
Block a user