X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/f477e5eddfbaf1b0787a5d7a1f4d33a224714b15..8b2a692faf16b1b29f803317701cd0bdcdb7ce12:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 13b3091..aa7279a 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -16,6 +16,7 @@ handle_crosscompile()
                 export ARCH=arm64
                 export CROSS_COMPILE=aarch64-linux-gnu-
                 export DEBOOTSTRAP=qemu-debootstrap
+                sudo apt install -y libc6-dev-arm64-cross
         fi
 }
 
@@ -23,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-07-19-4k.txt > .config
+        cat ../../config-4k.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -40,9 +41,9 @@ build_m1n1()
 (
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
-        git fetch
+        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`
 )
 }
@@ -53,11 +54,11 @@ build_uboot()
         handle_crosscompile
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
-        git fetch
+        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
+        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`
 )
@@ -77,7 +78,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`
 
@@ -206,7 +207,7 @@ publish_artefacts()
 mkdir -p build
 cd build
 
-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
 
 build_linux
 build_m1n1