the last patch made it upstream

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f8b5aba7076ab7e868cdc4c7b2c372904f0f9eda..5d90ba9bdc8bdf4ab7f4b9469c387063edbf04d1 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,7 +27,6 @@ build_linux()
         cd linux
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/XKVZ.patch | git am -
         curl -s https://tg.st/u/config-2022-03-02-16k > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
@@ -155,7 +154,10 @@ EOF
 
 build_asahi_installer_image()
 {
-        zip -r9 debian-base.zip EFI media
+        rm -rf esp
+        mkdir esp
+        mv EFI esp/
+        zip -r9 debian-base.zip esp media
 }
 
 build_di_stick()
@@ -195,9 +197,9 @@ build_linux
 build_m1n1
 build_uboot
 build_rootfs
-build_live_stick
 build_di_stick
 build_dd
 build_efi
 build_asahi_installer_image
+build_live_stick
 publish_artefacts