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

test/shell.d/t2-hardware-test.sh

@@ -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)