X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/9eed8ca6a00effd07552e7db600a9ce656674534..69f9e8c27ef5da4d040486ddf377ba38b226836d:/m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 2346db3..34b657c 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,17 +16,27 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
+handle_crosscompile()
+{
+        if [ "`uname -m`" != 'aarch64' ]; then
+                export ARCH=arm64
+                export CROSS_COMPILE=aarch64-linux-gnu-
+                sudo apt install -y libc6-dev-arm64-cross
+        fi
+}
+
 build_linux()
 {
 (
+        handle_crosscompile
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.1-rc8-3;
+        git reset --hard asahi-6.3-7;
         cat ../../config.txt > .config
-        make LLVM=-15 rustavailable
-        make LLVM=-15 olddefconfig
-        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
+        make LLVM=${CLANG_VERSION} rustavailable
+        make LLVM=${CLANG_VERSION} olddefconfig
+        make -j `nproc` LLVM=${CLANG_VERSION} V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -36,7 +46,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.2.9;
         make -j `nproc`
 )
 }
@@ -44,10 +54,11 @@ build_m1n1()
 build_uboot()
 {
 (
+        handle_crosscompile
         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.04-2;
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -58,7 +69,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.3-2
+        export M1N1_VERSION=1.2.9
         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
@@ -73,7 +84,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
@@ -89,6 +100,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