Line in the wrong section spotted by Jostein Kjønigsen

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 15d3cc4d4141b35ec2c39f2c41d9e259e304859b..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
 
 unset LC_CTYPE
 unset LANG
 

-export M1N1_VERSION=1.4.3
+export M1N1_VERSION=1.4.11
+export KERNEL_VERSION=asahi-6.6-14
+export UBOOT_VERSION=asahi-v2023.07.02-4

 
 build_linux()
 {
 
 build_linux()
 {


@@ -24,7 +26,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
         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
         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};
         cd m1n1
         git fetch -a -t
         git reset --hard v${M1N1_VERSION};

+        git clean -f -x -d > /dev/null

         make -j `nproc`
 )
 }
         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
         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`
 
         make apple_m1_defconfig
         make -j `nproc`