From 983712fba04f26ab8e25806380f1342bc648239d Mon Sep 17 00:00:00 2001
From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Thu, 3 Aug 2023 12:59:59 +0200
Subject: [PATCH] more dependencies; bump versions

---
 dependencies.sh      | 2 +-
 m1n1_uboot_kernel.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dependencies.sh b/dependencies.sh
index dedf3d2..859c6a8 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves zstd lsb-release
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves zstd lsb-release clang-15 lld-15
diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index fb79e7f..2726493 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -32,7 +32,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.4-3;
+        git reset --hard asahi-6.4-6;
         curl https://tg.st/u/0001-remove-debug-spam.patch | git am -
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
@@ -47,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.3.0;
+        git reset --hard v1.3.2;
         make -j `nproc`
 )
 }
@@ -59,7 +59,7 @@ 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.04-2;
+        git reset --hard asahi-v2023.07.02-2;
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -70,7 +70,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.3.0
+        export M1N1_VERSION=1.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
-- 
2.39.2