X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/6758869bef779ff63ccde0a7fdf06524cd1afcfc..4f88b92567806980ac34b8f0225d668790c4c955:/m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 293f161..dc30fd4 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,18 +16,19 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
+export M1N1_VERSION=1.4.2
+
 build_linux()
 {
 (
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.4-6;
-        curl https://tg.st/u/0001-remove-debug-spam.patch | git am -
+        git reset --hard asahi-6.5-13
         cat ../../config.txt > .config
-        make LLVM=${CLANG_VERSION} rustavailable
-        make LLVM=${CLANG_VERSION} olddefconfig
-        make -j `nproc` LLVM=${CLANG_VERSION} V=0 bindeb-pkg > /dev/null
+        make LLVM=-15 rustavailable
+        make LLVM=-15 olddefconfig
+        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -37,7 +38,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v1.3.2;
+        git reset --hard v{M1N1_VERSION};
         make -j `nproc`
 )
 }
@@ -59,7 +60,6 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.3.2
         rm -rf m1n1_${M1N1_VERSION}_arm64
         mkdir -p m1n1_${M1N1_VERSION}_arm64/DEBIAN m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/
         cp u-boot.bin m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/boot.bin
@@ -90,12 +90,6 @@ EOF
 )
 }
 
-if type clang-15; then
-        export CLANG_VERSION=-15
-elif type clang-11; then
-        export CLANG_VERSION=-11
-fi
-
 mkdir -p build
 cd build