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

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 113c97243fc6583fec3fd01582b25cedee23bdbf..9e9b90bc787eb452e4d918227846b6f88b7f4f99 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -16,23 +16,15 @@ source "$(pwd)/build/cargo/env"
 unset LC_CTYPE
 unset LANG
 
-handle_crosscompile()
-{
-        if [ "`uname -m`" != 'aarch64' ]; then
-                export ARCH=arm64
-                export CROSS_COMPILE=aarch64-linux-gnu-
-                sudo apt install -y libc6-dev-arm64-cross
-        fi
-}
+export M1N1_VERSION=1.4.2
 
 build_linux()
 {
 (
-        handle_crosscompile
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard origin/asahi-wip;
+        git reset --hard asahi-6.5-13
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig
@@ -46,7 +38,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.6;
+        git reset --hard v{M1N1_VERSION};
         make -j `nproc`
 )
 }
@@ -54,11 +46,10 @@ build_m1n1()
 build_uboot()
 {
 (
-        handle_crosscompile
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard asahi-v2023.01-3;
+        git reset --hard asahi-v2023.07.02-2;
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -69,7 +60,6 @@ build_uboot()
 package_boot_bin()
 {
 (
-        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