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

[m1-debian] / gpu.sh

diff --git a/gpu.sh b/gpu.sh
index 6cfbd1653ad8f408f2e68a7d1b6d81ce53a7a9bb..edd2987c67a38bbf5ba5812ccedcc3b36861f90b 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -1,9 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # SPDX-License-Identifier: MIT
 
-set -x
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
+cd "$(dirname "$0")"
 
 unset LC_CTYPE
 unset LANG
@@ -14,12 +18,13 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
-        git reset --hard origin/asahi-wip;
-        curl -sL https://tg.st/u/78cf358c267e7df34d6428d2ee621cf83d9a06b2c5b1e798562730e196cd3754.config > .config
-        make olddefconfig
-        make -j `nproc` V=0 > /dev/null
-        sudo make modules_install
-        sudo make install
+        git reset --hard origin/gpu/rust-wip;
+        source "$HOME/.cargo/env"
+        curl -o .config https://tg.st/u/92ad8143f16d51179975a7dc5f4a50990f57a20c97668a0be746a118f992ed63.config
+        make LLVM=-14 olddefconfig
+        make LLVM=-14 -j `nproc` V=0 > /dev/null
+        # sudo make LLVM=-14 V=0 modules_install > /dev/null
+        sudo make LLVM=-14 install
 )
 }
 
@@ -40,25 +45,19 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
-        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
 
-echo 'On my last try it booted, but the following things did not work: usb-a, usb-c, network, shutdown or reboot'
-exit 1;
-
 build_linux
 build_m1n1
 build_uboot