only use big fonts; upgrade m1n1

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 30bc228cdfb5801177480494eb0f3884e8ee2d65..5640e973e19c82e10e1a16d94325c17b7fb9a4ae 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,9 +31,8 @@ build_linux()
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         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 -
-        cat ../../config > .config
+        git reset --hard asahi-6.1-rc8-3; git clean -f -x -d &> /dev/null
+        cat ../../config-16k.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -46,7 +45,7 @@ build_m1n1()
         cd m1n1
         git fetch -a -t
         # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
-        git reset --hard v1.1.4; git clean -f -x -d &> /dev/null
+        git reset --hard v1.2.3; git clean -f -x -d &> /dev/null
         make -j `nproc`
 )
 }
@@ -59,9 +58,8 @@ 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-3; git clean -f -x -d &> /dev/null
+        git reset --hard asahi-v2022.10-1; git clean -f -x -d &> /dev/null
         git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
-        curl -s https://tg.st/u/0001-usb_setup_descriptor-Add-1ms-delay-in-order-to-unbre.patch | git am -
 
         make apple_m1_defconfig
         make -j `nproc`
@@ -206,6 +204,7 @@ publish_artefacts()
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
         sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 2k.bin 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
+        echo 'Reminder: Publish __all__ kernel packages'
 }
 
 mkdir -p build
@@ -216,9 +215,6 @@ 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
@@ -226,5 +222,3 @@ build_efi
 build_asahi_installer_image
 build_live_stick
 publish_artefacts
-
-echo 'Reminder: On the next release publish __all__ kernel packages'