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

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 34b657c69db00481f7fb26e9e4313f24c919c1e5..aa8dfe3c2c763748f0cbed43b901f698d9cfad0f 100644 (file)
--- 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.3-7;
+        git reset --hard asahi-6.4-3;
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
@@ -46,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.9;
+        git reset --hard v1.3.0;
         make -j `nproc`
 )
 }
@@ -69,7 +69,7 @@ build_uboot()
 package_boot_bin()
 {
 (
-        export M1N1_VERSION=1.2.9
+        export M1N1_VERSION=1.3.0
         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/meta.sh b/meta.sh
index 6de79729c86cc16dccb4db78462c167b7d266c43..ffab2e63773eda13643a0dc5d897de027fa9a207 100644 (file)
--- a/meta.sh
+++ b/meta.sh
@@ -12,14 +12,14 @@ unset LANG
 
 mkdir -p build
 cd build
-export META_VERSION=6.3.0-4
+export META_VERSION=6.4.0-1
 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-00668-g1a9452fde941
+Depends: linux-image-6.4.0-asahi-00514-gbb1ea272fd94
 Provides: wireguard-modules (= 1.0.0)
 Priority: optional
 Architecture: arm64

diff --git a/prepare_rust.sh b/prepare_rust.sh
index de85c9b1bcb896f7017dca4d731dcfbe3f3a0a9c..bbe184e16b5d7def7271b435c309845935e31b88 100644 (file)
--- a/prepare_rust.sh
+++ b/prepare_rust.sh
@@ -16,7 +16,7 @@ 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.66.0
+rustup override set 1.68.2
 rustup component add rust-src
 cargo install --locked --version 0.56.0 bindgen
 rustup component add rustfmt