X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/1ebb14ab8353067bbf552121a5e0ed500dd4cba7..9f9ca9759842ba86cb4f625f029129aa7b13340d:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 13606c6..e6b5427 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,12 +27,9 @@ build_linux()
         cd linux
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
-        curl -s https://tg.st/u/0001-Hookup-backlight-for-MacBook-Pro-13-inch-M1-2020-J29.patch | git am -
-        curl -s https://tg.st/u/XKVZ.patch | git am -
-        curl -s https://tg.st/u/config-2022-02-19 > .config
+        curl -s https://tg.st/u/config-2022-03-04-16k > .config
         make olddefconfig
-        make -j `nproc` V=0 bindeb-pkg
+        make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -125,7 +122,7 @@ build_dd()
         rm -f media
         dd if=/dev/zero of=media bs=1 count=0 seek=1G
         mkdir -p mnt
-        mkfs.ext4 -O ^metadata_csum media
+        mkfs.ext4 media
         tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
         sudo mount -o loop media mnt
         sudo cp -a testing/* mnt/
@@ -155,6 +152,14 @@ EOF
 )
 }
 
+build_asahi_installer_image()
+{
+        rm -rf esp
+        mkdir esp
+        mv EFI esp/
+        zip -r9 debian-base.zip esp media
+}
+
 build_di_stick()
 {
         rm -rf di-stick
@@ -180,7 +185,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 di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi /u/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
 }
 
 mkdir -p build
@@ -192,8 +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