bump versions, no sound on m1 air and dmesg full of i2c-apple 23501c000.i2c: Bus...

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index ce99944fca2be2060837197cf17ad165c40bce1a..1cf4b8e7c4e5214327f38268ef00c17e8e956e78 100644 (file)
--- 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;
-        cat ../../newconfig.txt > .config
-        make LLVM=-15 rustavailable
-        make LLVM=-15 olddefconfig
-        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
+        git reset --hard asahi-6.2-rc3-5;
+        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
 )
 }
 
@@ -37,6 +47,7 @@ build_m1n1()
         cd m1n1
         git fetch -a -t
         git reset --hard v1.2.3;
+        curl -sL https://tg.st/u/272.patch | git am -
         make -j `nproc`
 )
 }
@@ -44,6 +55,7 @@ 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
@@ -58,7 +70,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.3-2
+        export M1N1_VERSION=1.2.3-7
         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
@@ -89,10 +101,16 @@ 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
 
 build_linux
-# build_m1n1
-# build_uboot
-# package_boot_bin
+build_m1n1
+build_uboot
+package_boot_bin