use suggestion from ahdeb

[m1-debian] / gpu.sh

diff --git a/gpu.sh b/gpu.sh
index f6ee3f0fc85f50f6bde36307afcc7451d56d7767..4789b2c4ab07edbaf51cd13586c603f0e743c3db 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -12,19 +12,27 @@ cd "$(dirname "$0")"
 unset LC_CTYPE
 unset LANG
 
+handle_crosscompile()
+{
+        if [ "`uname -m`" != 'aarch64' ]; then
+                export ARCH=arm64
+                export CROSS_COMPILE=aarch64-linux-gnu-
+                export DEBOOTSTRAP=qemu-debootstrap
+                sudo apt install -y libc6-dev-arm64-cross
+        fi
+}
+
 build_linux()
 {
 (
         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.1-rc8-3;
         source "$HOME/.cargo/env"
-        curl -sL https://tg.st/u/3007a82fe2f3ef7d91945e1cb3e5a167f8d6b0550ecb67850d1cd85f3efa112e.config > .config
+        cat ../../config-gpu.txt > .config
         make LLVM=-14 olddefconfig
-        make LLVM=-14 -j `nproc` V=0 > /dev/null
-        sudo make LLVM=-14 modules_install
-        sudo make LLVM=-14 install
+        make -j `nproc` LLVM=-14 V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -34,7 +42,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard origin/lina/gpu-wip;
+        git reset --hard v1.2.2;
         make -j `nproc`
 )
 }
@@ -45,19 +53,18 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard origin/asahi;
-        curl -s https://tg.st/u/0001-usb-request-on-8-bytes-for-USB_SPEED_FULL-bMaxPacket.patch | git am -
+        git reset --hard asahi-v2022.10-1;
+
         make apple_m1_defconfig
         make -j `nproc`
 )
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
-        sudo cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
-        sudo cp u-boot.bin /boot/efi/m1n1/boot.bin
 }
 
 mkdir -p build
 cd build
 
+handle_crosscompile
 build_linux
 build_m1n1
 build_uboot