From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Tue, 10 Oct 2023 18:39:27 +0000 (+0200)
Subject: Merge branch 'master' of 88.198.237.222:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/29605f60ad24689060115164f3821627dabf969d?hp=9a4bdc5113d033f222e3383a427ef2c107532eb4

Merge branch 'master' of 88.198.237.222:/git/m1-debian
---

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 46d203d..9e9b90b 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,7 +16,7 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
-export M1N1_VERSION=1.4.0
+export M1N1_VERSION=1.4.2
 
 build_linux()
 {
@@ -24,7 +24,7 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.5-8;
+        git reset --hard asahi-6.5-13
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
diff --git a/prepare_rust.sh b/prepare_rust.sh
index 8e66744..7bdb067 100644
--- a/prepare_rust.sh
+++ b/prepare_rust.sh
@@ -16,8 +16,8 @@ export RUSTUP_HOME="$(pwd)/build/rust"
 rm -rf ${CARGO_HOME} ${RUSTUP_HOME}
 curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain none
 source "$(pwd)/build/cargo/env"
-rustup override set 1.70.0
+rustup override set 1.68.2
 rustup component add rust-src
-cargo install --locked --version 0.62.0 bindgen-cli
+cargo install --locked --version 0.56.0 bindgen #-cli
 rustup component add rustfmt
 rustup component add clippy