+= jannaus keyboard patch

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index c24b44f5447124d68ed2a64a713b9901de5e8d1e..c79389d2e741f3ff36e67a121c0b12a5a3ed9aa9 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -26,11 +26,11 @@ build_linux()
         handle_crosscompile
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
-        git fetch
-        git reset --hard asahi-5.19-3; git clean -f -x -d &> /dev/null
+        git fetch -a -t
+        git reset --hard asahi-5.19-5; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
         curl -s https://tg.st/u/0001-4k-iommu-patch-2022-07-20.patch | git am -
-        curl -s https://tg.st/u/config-2022-08-13-4k.txt > .config
+        cat ../../config-4k.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -58,6 +58,7 @@ build_uboot()
         # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
         git reset --hard asahi-v2022.07-3; git clean -f -x -d &> /dev/null
         git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
+        curl -s https://tg.st/u/0001-usb-request-on-8-bytes-for-USB_SPEED_FULL-bMaxPacket.patch | git am -
         make apple_m1_defconfig
         make -j `nproc`
 )