+= git reset --hard origin/main

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index 65ad62840bc073c38e46f383f4d53b4c8409a9db..6922e312c6b2e39f3f706599a31408a22756b65e 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -9,20 +9,34 @@ set -o xtrace
 
 cd "$(dirname "$0")"
 
+export CARGO_HOME="$(pwd)/build/cargo"
+export RUSTUP_HOME="$(pwd)/build/rust"
+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
+}
+
 build_linux()
 {
 (
+        handle_crosscompile
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard asahi-6.1-rc8-3;
-        source "$HOME/.cargo/env"
-        cat ../../config-gpu.txt > .config
-        make LLVM=-15 olddefconfig
-        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
+        git reset --hard asahi-6.1-2;
+        cat ../../config.txt > .config
+        make LLVM=${CLANG_VERSION} rustavailable
+        make LLVM=${CLANG_VERSION} olddefconfig
+        make -j `nproc` LLVM=${CLANG_VERSION} V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -40,6 +54,7 @@ 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
@@ -85,6 +100,12 @@ EOF
 )
 }
 
+if type clang-15; then
+        export CLANG_VERSION=-15
+elif type clang-11; then
+        export CLANG_VERSION=-11
+fi
+
 mkdir -p build
 cd build