X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/cae69632ed89f09bea8319fa2afcc7d28dcfb4d1..79777387dbb2f974c26eb29e19e1be7cd36755a5:/m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 65ad628..e32bcde 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -9,6 +9,10 @@ set -o xtrace
 
 cd "$(dirname "$0")"
 
+export CARGO_HOME="$(pwd)/build/cargo"
+export RUSTUP_HOME="$(pwd)/build/rust"
+source "$(pwd)/build/cargo/env"
+
 unset LC_CTYPE
 unset LANG
 
@@ -18,11 +22,11 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.1-rc8-3;
-        source "$HOME/.cargo/env"
-        cat ../../config-gpu.txt > .config
-        make LLVM=-15 olddefconfig
-        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
+        git reset --hard asahi-6.4-9;
+        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
 )
 }
 
@@ -32,7 +36,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v1.2.3;
+        git reset --hard v1.3.3;
         make -j `nproc`
 )
 }
@@ -43,7 +47,7 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard asahi-v2022.10-1;
+        git reset --hard asahi-v2023.07.02-2;
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -54,7 +58,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.3-2
+        export M1N1_VERSION=1.3.3
         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
@@ -69,7 +73,7 @@ Description: Apple silicon boot loader
  Next to m1n1 this also contains the device trees and u-boot.
 EOF
 
-        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<EOF
+        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<'EOF'
 #!/bin/bash
 
 export PATH=/bin
@@ -85,6 +89,12 @@ 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