manual merge

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 293f161ea79e4ce66b07df0e90f162c4848820fa..e32bcde98b59a478013e03839cb260c1f6bd4e97 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -22,8 +22,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-6;
-        curl https://tg.st/u/0001-remove-debug-spam.patch | git am -
+        git reset --hard asahi-6.4-9;
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
@@ -37,7 +36,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.2;
+        git reset --hard v1.3.3;
         make -j `nproc`
 )
 }
@@ -59,7 +58,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.3.2
+        export M1N1_VERSION=1.3.3
         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 3d08af8ca660f264f6402f64ee75e851c663198d..636a234b585853cd3d89b2828a3496cb84349963 100644 (file)
--- 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-20230725
+git reset --hard asahi-20230821
 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 ad52188399bcb09fd4a5c8190557fc098c210f88..a42ba4679eec23db3d3a9c1b9109ce5e39d23a1a 100644 (file)
--- a/meta.sh
+++ b/meta.sh
@@ -19,7 +19,7 @@ cat > linux-image-asahi_${META_VERSION}_arm64/DEBIAN/control <<EOF
 Package: linux-image-asahi
 Version: $META_VERSION
 Section: base
-Depends: linux-image-6.4.0-asahi-00528-g05576dba2ffc
+Depends: linux-image-6.4.0-asahi-00571-gda70cd78bc50
 Provides: wireguard-modules (= 1.0.0)
 Priority: optional
 Architecture: arm64