revert back to a stable config until povik wip has been merged into asahi tree

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f8b5aba7076ab7e868cdc4c7b2c372904f0f9eda..7f23c72c9eda355455bed5d8c22d82c410695bd0 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,8 +27,8 @@ 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
+        curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
+        curl -s https://tg.st/u/config-2022-03-09-4k > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -99,7 +99,7 @@ build_rootfs()
         sudo chroot . dpkg -i ${KERNEL}
         sudo rm ${KERNEL}
 
-        sudo bash -c 'apt-get clean'
+        sudo bash -c 'chroot . apt-get clean'
 )
 }
 
@@ -123,7 +123,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,7 +155,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()
@@ -189,15 +192,15 @@ 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
+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
 
 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