From 3d73deff38205822d5a46f9608627f87e1656ae8 Mon Sep 17 00:00:00 2001 From: Thomas Glanzmann Date: Thu, 27 Apr 2023 22:58:39 +0200 Subject: [PATCH] bump version --- m1n1_uboot_kernel.sh | 4 ++-- mesa.sh | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh index f6a984e..113c972 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-12; + git reset --hard origin/asahi-wip; cat ../../config.txt > .config make LLVM=${CLANG_VERSION} rustavailable make LLVM=${CLANG_VERSION} olddefconfig @@ -69,7 +69,7 @@ build_uboot() package_boot_bin() { ( - export M1N1_VERSION=1.2.6-1 + export M1N1_VERSION=1.2.6-2 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 df2c7f6..4240088 100644 --- a/mesa.sh +++ b/mesa.sh @@ -20,7 +20,12 @@ 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 +# 17:17 also for mesa, use the latest versioned tag I made, *not* any +# live branch. mesa and kernel live branches are not kept in sync. generally +# 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-20230321 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' -- 2.39.5