diff --git a/t2linux-config/firmware.sh b/t2linux-config/firmware.sh index b8adca6..478fcd1 100644 --- a/t2linux-config/firmware.sh +++ b/t2linux-config/firmware.sh @@ -30,7 +30,7 @@ case "$os" in else tar czf "/Volumes/${EFILABEL}/firmware.tar.gz" * fi - if [[ (${identifier} = iMac19,1) || (${identifier} = iMac19,2) ]] + if [[ (${identifier} = iMac19,1) || (${identifier} = iMac19,2) || (${identifier} = iMacPro1,1) ]] then nvramfile=$(ioreg -l | grep RequestedFiles | cut -d "/" -f 5 | rev | cut -c 4- | rev) txcapblob=$(ioreg -l | grep RequestedFiles | cut -d "/" -f 3 | cut -d "\"" -f 1) @@ -459,4 +459,4 @@ col = WiFiFWCollection(sys.argv[1]+"/wifi") pkg.add_files(sorted(col.files())) col = BluetoothFWCollection(sys.argv[1]+"/bluetooth") pkg.add_files(sorted(col.files())) -pkg.close() \ No newline at end of file +pkg.close() diff --git a/t2linux-config/t2linux-config.spec b/t2linux-config/t2linux-config.spec index ade24b6..1fb6c20 100644 --- a/t2linux-config/t2linux-config.spec +++ b/t2linux-config/t2linux-config.spec @@ -1,5 +1,5 @@ Name: t2linux-config -Version: 11.0.0 +Version: 11.1.0 Release: 1%{?dist} Summary: System configuration for linux on t2 macs. License: MIT @@ -19,6 +19,7 @@ Configuration and tools for linux on T2 macs. %build echo -e 'apple_bce\nsnd-seq' > t2linux-modules.conf echo -e 'add_drivers+=" apple_bce snd_seq "' > t2linux-modules-install.conf +echo -e 'blacklist cdc_ncm\nblacklist cdc_mbim' > t2linux-modprobe.conf %install @@ -28,6 +29,8 @@ install -D -m 644 t2linux-modules-install.conf %{buildroot}/etc/dracut.conf.d/t2 install -D -m 644 t2linux-modules.conf %{buildroot}/etc/modules-load.d/t2linux-modules.conf +install -D -m 644 t2linux-modprobe.conf %{buildroot}/etc/modprobe.d/t2linux-modprobe.conf + %post grubby --args="intel_iommu=on iommu=pt" --update-kernel=ALL grubby --remove-args="pcie_ports=compat" --update-kernel=ALL @@ -35,4 +38,5 @@ grubby --remove-args="pcie_ports=compat" --update-kernel=ALL %files /etc/modules-load.d/t2linux-modules.conf /etc/dracut.conf.d/t2linux-modules-install.conf +/etc/modprobe.d/t2linux-modprobe.conf %{_bindir}/firmware.sh