X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/65ef55f7c7ab2619eec53b9ab62b8271915f1f84..280e21cddc3274b063f4e517f6d7ca5707bd319b:/m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 5d17dbb..72727a8 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,7 +16,9 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
-export M1N1_VERSION=1.4.2
+export M1N1_VERSION=1.4.11
+export KERNEL_VERSION=asahi-6.6-14
+export UBOOT_VERSION=asahi-v2023.07.02-4
 
 build_linux()
 {
@@ -24,7 +26,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.5-15
+        git reset --hard $KERNEL_VERSION
         git clean -f -x -d > /dev/null
         cat ../../config.txt > .config
         make LLVM=-15 rustavailable
@@ -40,6 +42,7 @@ build_m1n1()
         cd m1n1
         git fetch -a -t
         git reset --hard v${M1N1_VERSION};
+        git clean -f -x -d > /dev/null
         make -j `nproc`
 )
 }
@@ -50,7 +53,8 @@ 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-v2023.07.02-3
+        git reset --hard $UBOOT_VERSION
+        git clean -f -x -d > /dev/null
 
         make apple_m1_defconfig
         make -j `nproc`