Feedback from Sebastian

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 46d203df69a07796aefd18c58b5e83667204b521..72727a8916237c003b5725b9546b9b7d79bd27a7 100644 (file)
--- 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.0
+export M1N1_VERSION=1.4.11
+export KERNEL_VERSION=asahi-6.6-14
+export UBOOT_VERSION=asahi-v2023.07.02-4
 
 build_linux()
 {
@@ -24,11 +26,12 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.5-8;
+        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
 )
 }
 
@@ -38,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 v{M1N1_VERSION};
+        git reset --hard v${M1N1_VERSION};
+        git clean -f -x -d > /dev/null
         make -j `nproc`
 )
 }
@@ -49,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-2;
+        git reset --hard $UBOOT_VERSION
+        git clean -f -x -d > /dev/null
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -90,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