Revert "sync config options with asahi default config"

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 01f4bb81f76d8882c08fed9abed7bed0812a6e76..29242a2734b85c50d547cc93c33e8b6902e4a0f6 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -24,13 +24,13 @@ build_linux()
 {
 (
         handle_crosscompile
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi
+        test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
-        git fetch
-        git reset --hard origin/asahi; 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
 )
@@ -43,7 +43,7 @@ build_m1n1()
         cd m1n1
         git fetch -a -t
         # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
-        git reset --hard v1.1.3; git clean -f -x -d &> /dev/null
+        git reset --hard v1.1.4; git clean -f -x -d &> /dev/null
         make -j `nproc`
 )
 }
@@ -56,8 +56,7 @@ build_uboot()
         cd u-boot
         git fetch -a -t
         # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
-        git reset --hard asahi-v2022.07-2; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/0001-usb-storage-continue-probe-on-Invalid-device.patch | git am -
+        git reset --hard asahi-v2022.07-3; git clean -f -x -d &> /dev/null
         git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
         make apple_m1_defconfig
         make -j `nproc`