X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/457e60ad6ddeab6471022d12792e042f5b4695ee..f75bb0316722213ed7f8137c09051add8e25391b:/m1n1_uboot_kernel.sh?ds=sidebyside

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 1ba642d..72727a8 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,29 +16,22 @@ 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
-}
+export M1N1_VERSION=1.4.11
+export KERNEL_VERSION=asahi-6.6-14
+export UBOOT_VERSION=asahi-v2023.07.02-4
 
 build_linux()
 {
 (
-        handle_crosscompile
         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/5ec32cdb6555bf935fd621ef8923410a1f51b5b9.patch | git am -
-        curl -sL https://tg.st/u/c65f0ecca767f7853bf33f1710d7637f11b70403.patch | git am -
+        git reset --hard $KERNEL_VERSION
+        git clean -f -x -d > /dev/null
         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
 )
 }
 
@@ -48,7 +41,8 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v1.2.7-7-g076217a;
+        git reset --hard v${M1N1_VERSION};
+        git clean -f -x -d > /dev/null
         make -j `nproc`
 )
 }
@@ -56,11 +50,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-v2023.01-3;
+        git reset --hard $UBOOT_VERSION
+        git clean -f -x -d > /dev/null
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -71,7 +65,6 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.7-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
@@ -102,12 +95,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