X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/d5659d5f502f695f7a321c3aa06518e29a6e9e65..13286d2f608748b528ece2586a5f08728a983f2d:/m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 661265a..f9c3975 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -32,7 +32,8 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.2-5;
+        git reset --hard origin/asahi-wip;
+        curl -sL https://tg.st/u/5ec32cdb6555bf935fd621ef8923410a1f51b5b9.patch | git am -
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
@@ -46,7 +47,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v1.2.5;
+        git reset --hard v1.2.7;
         make -j `nproc`
 )
 }
@@ -59,6 +60,7 @@ build_uboot()
         cd u-boot
         git fetch -a -t
         git reset --hard asahi-v2023.01-3;
+        curl https://tg.st/u/0001-apple-Generate-EFI-boot-option-for-the-EFI-system-pa.patch | git am -
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -69,7 +71,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.4-2
+        export M1N1_VERSION=1.2.7
         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
@@ -84,7 +86,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