From: Thomas Glanzmann Date: Wed, 20 Dec 2023 20:19:58 +0000 (+0100) Subject: bump versions X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/646674550434dc2fcee57238bc5ff589bbc2c822?ds=sidebyside bump versions --- diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh index 9ae38ef..72727a8 100644 --- a/m1n1_uboot_kernel.sh +++ b/m1n1_uboot_kernel.sh @@ -16,8 +16,9 @@ source "$(pwd)/build/cargo/env" unset LC_CTYPE unset LANG -export M1N1_VERSION=1.4.6 -export KERNEL_VERSION=asahi-6.5-26 +export M1N1_VERSION=1.4.11 +export KERNEL_VERSION=asahi-6.6-14 +export UBOOT_VERSION=asahi-v2023.07.02-4 build_linux() { @@ -52,7 +53,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.07.02-3 + git reset --hard $UBOOT_VERSION git clean -f -x -d > /dev/null make apple_m1_defconfig diff --git a/mesa.sh b/mesa.sh index 166268d..c08938e 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 if those two desync it'll refuse to initialize -git reset --hard asahi-20230904 +git reset --hard asahi-20231213 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/prepare_rust.sh b/prepare_rust.sh index 31d85dd..325b96b 100644 --- a/prepare_rust.sh +++ b/prepare_rust.sh @@ -16,9 +16,9 @@ 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 default 1.70.0 +rustup override set 1.71.1 +rustup default 1.71.1 rustup component add rust-src -cargo install --locked --version 0.62.0 bindgen-cli +cargo install --locked --version 0.65.1 bindgen-cli rustup component add rustfmt rustup component add clippy