From 9a986e53e3b864d67f67e507c35a8fbf8d031e3f Mon Sep 17 00:00:00 2001 From: sharpenedblade Date: Fri, 23 Sep 2022 17:50:35 -0700 Subject: [PATCH] 5.19.9-200 [rel] --- build.sh | 5 +---- t2linux-config.spec | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.sh b/build.sh index dab9893..14c4301 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -FEDORA_KERNEL_VERSION=5.19.9-200.fc36 +FEDORA_KERNEL_VERSION=5.19.10-200.fc36 PATCHES_GIT=https://github.com/Redecorating/linux-t2-arch PATCHES_COMMIT=65a5575de77284c0a36c95510ebaaa8e8a867bc5 @@ -18,9 +18,6 @@ cd /root/rpmbuild/SPECS # Fedora devs are against merging kernel-local for all architectures, so we have to patch it in. sed -i "s@for i in %{all_arch_configs}@for i in *.config@g" kernel.spec dnf -y builddep kernel.spec -cd /root/rpmbuild/SOURCES -curl "https://wiki.t2linux.org/tools/rmmod_tb.sh" > rmmod_tb.sh -curl "https://github.com/kekrby/t2-better-audio/archive/5a46dcb9f274c503802d77a0b11034312ef20f5d/t2-better-audio-5a46dcb.tar.gz" > t2-better-audio-5a46dcb.tar.gz echo "======DOWNLOADING PATCHES=====" rm -rf /tmp/download /tmp/src diff --git a/t2linux-config.spec b/t2linux-config.spec index 49e7e3b..957b0f5 100644 --- a/t2linux-config.spec +++ b/t2linux-config.spec @@ -2,19 +2,24 @@ Name: linux-t2 Version: 5.19.9 Release: 1%{?dist} Summary: System configuration for linux on t2 macs. - License: MIT + +%undefine _disable_source_fetch + URL: https://t2linux.org Source0: https://wiki.t2linux.org/tools/rmmod_tb.sh -Source1: https://github.com/kekrby/t2-better-audio/archive/5a46dcb9f274c503802d77a0b11034312ef20f5d/t2-better-audio-5a46dcb.tar.gz + +%global audio_config_commit_long 5a46dcb9f274c503802d77a0b11034312ef20f5d +%global audio_config_commit %(c=%{audio_config_commit_long}; echo ${c:0:7}) + +Source1: https://github.com/kekrby/t2-better-audio/archive/%{audio_config_commit_long}/t2-better-audio-%{audio_config_commit}.tar.gz %description Configuration files for linux on t2 macs. Everything works except for TouchId, eGPU, and audio switching. %prep cp %{_sourcedir}/rmmod_tb.sh %{_builddir} -tar -xf t2-better-audio-*.tar.gz -cp -r t2-better-audio-* %{_builddir} +tar -xf %{_sourcedir}/t2-better-audio-%{audio_config_commit}.tar.gz %build echo -e 'hid-apple\nbcm5974\nsnd-seq\napple_bce' > apple_bce.conf @@ -33,7 +38,7 @@ mv %{_builddir}/rmmod_tb.sh %{buildroot}/lib/systemd/system-sleep/rmmod_tb.sh chmod +x %{buildroot}/lib/systemd/system-sleep/rmmod_tb.sh mkdir -p %{buildroot}/usr/share/alsa/ucm2 -cp -r %{_builddir}/t2-better-audio-*/files/ucm2/* %{buildroot}/usr/share/alsa/ucm2 +cp -r %{_builddir}/t2-better-audio-%{audio_config_commit_long}/files/ucm2/* %{buildroot}/usr/share/alsa/ucm2 %post grubby --remove-args="efi=noruntime" --update-kernel=ALL @@ -43,3 +48,4 @@ grubby --args="intel_iommu=on iommu=pt pcie_ports=compat" --update-kernel=ALL /etc/modules-load.d/apple_bce.conf /lib/systemd/system-sleep/rmmod_tb.sh /etc/dracut.conf.d/apple_bce_install.conf +/usr/share/alsa/ucm2