From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Wed, 7 Jun 2023 21:22:10 +0000 (+0200)
Subject: bump versions
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/cf1201694b23734c90f9276bb7220cc25c239837?hp=457e60ad6ddeab6471022d12792e042f5b4695ee

bump versions
---

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 1ba642d..34b657c 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -32,9 +32,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard origin/asahi-wip;
-        curl -sL https://tg.st/u/5ec32cdb6555bf935fd621ef8923410a1f51b5b9.patch | git am -
-        curl -sL https://tg.st/u/c65f0ecca767f7853bf33f1710d7637f11b70403.patch | git am -
+        git reset --hard asahi-6.3-7;
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
@@ -48,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.7-7-g076217a;
+        git reset --hard v1.2.9;
         make -j `nproc`
 )
 }
@@ -60,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-v2023.01-3;
+        git reset --hard asahi-v2023.04-2;
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -71,7 +69,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.7-3
+        export M1N1_VERSION=1.2.9
         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
diff --git a/mesa.sh b/mesa.sh
index 4240088..c1623b0 100644
--- a/mesa.sh
+++ b/mesa.sh
@@ -25,7 +25,7 @@ git fetch -a -t
 # the latest mesa tag will be in sync with the latest kernel tag and usually
 # also the latest live kernel (except when I'm about to do a release)
 # 17:18 <marcan> if those two desync it'll refuse to initialize
-git reset --hard asahi-20230321
+git reset --hard asahi-20230606
 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'
diff --git a/meta.sh b/meta.sh
index a3cfb2e..6de7972 100644
--- a/meta.sh
+++ b/meta.sh
@@ -12,14 +12,14 @@ unset LANG
 
 mkdir -p build
 cd build
-export META_VERSION=6.3.0-3
+export META_VERSION=6.3.0-4
 rm -rf linux-image-asahi_${META_VERSION}_arm64
 mkdir -p linux-image-asahi_${META_VERSION}_arm64/DEBIAN
 cat > linux-image-asahi_${META_VERSION}_arm64/DEBIAN/control <<EOF
 Package: linux-image-asahi
 Version: $META_VERSION
 Section: base
-Depends: linux-image-6.3.0-asahi-00535-ga856200bc2a6
+Depends: linux-image-6.3.0-asahi-00668-g1a9452fde941
 Provides: wireguard-modules (= 1.0.0)
 Priority: optional
 Architecture: arm64