X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/4ea456f564913e37aff9be2f9d9e3db1e772420b..47f4d0079699acb634a0dc484b56c8b6b927389b:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 4dab225..f5a5aa7 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -26,13 +26,10 @@ 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-6.0-rc6-1; 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/0001-jeys-patch.patch | git am -
-        curl -s https://tg.st/u/0001-jeys-2nd-patch.patch | git am -
-        cat ../../config-4k.txt > .config
+        cat ../../config > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -60,6 +57,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`
 )
@@ -79,7 +77,7 @@ build_rootfs()
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk testing testing http://deb.debian.org/debian
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
@@ -213,6 +211,9 @@ sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu l
 build_linux
 build_m1n1
 build_uboot
+
+exit
+
 build_rootfs
 #build_di_stick
 build_dd