From d5659d5f502f695f7a321c3aa06518e29a6e9e65 Mon Sep 17 00:00:00 2001
From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sat, 11 Mar 2023 18:25:55 +0100
Subject: [PATCH] bump versions

---
 m1n1_uboot_kernel.sh |  6 +++---
 mesa.sh              | 32 ++++++++++++++------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 7139197..661265a 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.2-1;
+        git reset --hard asahi-6.2-5;
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
@@ -46,7 +46,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.4;
+        git reset --hard v1.2.5;
         make -j `nproc`
 )
 }
@@ -58,7 +58,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-v2022.10-1;
+        git reset --hard asahi-v2023.01-3;
 
         make apple_m1_defconfig
         make -j `nproc`
diff --git a/mesa.sh b/mesa.sh
index 24cce78..df2c7f6 100644
--- a/mesa.sh
+++ b/mesa.sh
@@ -10,23 +10,19 @@ cd "$(dirname "$0")"
 unset LC_CTYPE
 unset LANG
 
-main() {
-        mkdir -p build
-        cd build
+mkdir -p build
+cd build
 
-        # devscripts needed for dch and dcmd
-        dpkg -s devscripts >/dev/null 2>&1 || sudo apt-get install devscripts
+# devscripts needed for dch and dcmd
+dpkg -s devscripts >/dev/null 2>&1 || sudo apt-get install devscripts
 
-        command -v git >/dev/null || sudo apt-get install git
-        test -d mesa || git clone https://gitlab.freedesktop.org/asahi/mesa.git
-        cd mesa
-        git fetch -a -t
-        git reset --hard origin/main
-        rm -rf debian
-        cp -a ../../mesa-debian debian
-        EMAIL=thomas@glanzmann.de dch -v 23.0.0-`date +%Y%m%d%H%M` 'asahi wip'
-        sudo apt-get build-dep .
-        dpkg-buildpackage -uc -us -a arm64 --build=binary
-}
-
-main "$@"
+command -v git >/dev/null || sudo apt-get install git
+test -d mesa || git clone https://gitlab.freedesktop.org/asahi/mesa.git
+cd mesa
+git fetch -a -t
+git reset --hard asahi-20230311
+rm -rf debian
+cp -a ../../mesa-debian debian
+EMAIL=thomas@glanzmann.de dch -v 23.0.0-`date +%Y%m%d%H%M` 'asahi wip'
+sudo apt-get build-dep .
+dpkg-buildpackage -uc -us -a arm64 --build=binary
-- 
2.39.5