Merge branch 'master' of a.gmvl.de:/git/m1-debian

diff --git a/gpu.sh b/gpu.sh
index 61508fd351211dcda0af860aa92554ffabea44a1..d82b0453edce7eba7198ef987ff6dc733d28a18f 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -18,12 +18,13 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard origin/asahi-wip;
-        curl -sL https://tg.st/u/e633ae8c7e2f16d7bc845a0695e583a836d94846e1c33da182216e565c3769c4.config > .config
-        make olddefconfig
-        make -j `nproc` V=0 > /dev/null
-        sudo make modules_install
-        sudo make install
+        git reset --hard origin/gpu/rust-wip;
+        source "$HOME/.cargo/env"
+        curl -sL https://tg.st/u/3007a82fe2f3ef7d91945e1cb3e5a167f8d6b0550ecb67850d1cd85f3efa112e.config > .config
+        make LLVM=-14 olddefconfig
+        make LLVM=-14 -j `nproc` V=0 > /dev/null
+        sudo make LLVM=-14 modules_install
+        sudo make LLVM=-14 install
 )
 }
 

diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl
index 6b4c7014fb8fc8df1c1f602e753168f83d0742bb..2bc15b8c34028d89d04e746ebaa614ebe73ecb19 100644 (file)
--- a/patch_kernel_config.pl
+++ b/patch_kernel_config.pl
@@ -69,6 +69,7 @@ my %asahi_options = (
         'CONFIG_APPLE_M1_CPU_PMU' => 'y',
         'CONFIG_SND_SOC_CS42L83' => 'm',
         'CONFIG_DRM_APPLE' => 'y',
+        'CONFIG_DRM_ASAHI' => 'y',
 );
 
 my %debian_options;