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

[m1-debian] / mini.sh

diff --git a/mini.sh b/mini.sh
index 3547530907f91cf0de0412ea7a9b67bc8f3a2e52..79810ceac7b79d0a0e2b89938c11b22c7689ace4 100644 (file)
--- a/mini.sh
+++ b/mini.sh
@@ -20,7 +20,7 @@ build_linux()
         git fetch -a -t
         git reset --hard asahi-6.1-rc5-9
         source "$HOME/.cargo/env"
-        cat ../../upstream.config > .config
+        curl https://raw.githubusercontent.com/AsahiLinux/PKGBUILDs/main/linux-asahi/config | grep -v CONFIG_LOCALVERSION > .config
         make LLVM=-14 olddefconfig
         make LLVM=-14 -j `nproc` V=0 > /dev/null
         sudo make LLVM=-14 modules_install
@@ -45,8 +45,7 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
-        git reset --hard asahi-v2022.07-4;
-        curl -s https://tg.st/u/0001-usb-request-on-8-bytes-for-USB_SPEED_FULL-bMaxPacket.patch | git am -
+        git reset --hard origin/asahi;
 
         make apple_m1_defconfig
         make -j `nproc`