X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/7dcd418b393881b9325ce2115d2c83271c2d1200..c8c18241fdee4e453721940396a04cd38da2e976:/m1n1_uboot_kernel.sh?ds=inline

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index b9afb51..3129b1b 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,13 +16,16 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
+export M1N1_VERSION=1.4.3
+
 build_linux()
 {
 (
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.1-rc8-3;
+        git reset --hard asahi-6.5-15
+        git clean -f -x -d > /dev/null
         cat ../../config.txt > .config
         make LLVM=-15 rustavailable
         make LLVM=-15 olddefconfig
@@ -36,7 +39,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.3;
+        git reset --hard v${M1N1_VERSION};
+        git clean -f -x -d > /dev/null
         make -j `nproc`
 )
 }
@@ -47,7 +51,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-v2022.10-1;
+        git reset --hard asahi-v2023.07.02-3
+        git clean -f -x -d > /dev/null
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -58,7 +63,6 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.3-2
         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
@@ -73,7 +77,7 @@ Description: Apple silicon boot loader
  Next to m1n1 this also contains the device trees and u-boot.
 EOF
 
-        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<EOF
+        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<'EOF'
 #!/bin/bash
 
 export PATH=/bin
@@ -93,6 +97,6 @@ mkdir -p build
 cd build
 
 build_linux
-# build_m1n1
-# build_uboot
-# package_boot_bin
+build_m1n1
+build_uboot
+package_boot_bin