X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/409bd8cb215724a0ff602a54f6785cc6c5b2bc22..95a1bb661cddd68c3c19ec339b5663dc720228a8:/gpu.sh?ds=sidebyside

diff --git a/gpu.sh b/gpu.sh
index c875e0c..0adedd0 100644
--- 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/e633ae8c7e2f16d7bc845a0695e583a836d94846e1c33da182216e565c3769c4.config > .config
-        make olddefconfig
-        make -j `nproc` V=0 > /dev/null
-        sudo make modules_install
-        sudo make install
+        git reset --hard asahi-6.1-rc8-3;
+        source "$HOME/.cargo/env"
+        cat ../../config-gpu.txt > .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
 )
 }
 
@@ -29,7 +34,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`
 )
 }
@@ -40,8 +45,8 @@ 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`
 )