X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/f70867a08ae93f412faf85c9d36761abc57dd93f..62ab3460d78190f12475ff598f5f1e17b8e96fba:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 7a2d88a..2c5d1e9 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,7 +29,6 @@ build_linux()
         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/config-2022-03-09-4k > .config
-        git pull --commit https://github.com/povik/linux asahi-sound-wip
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -50,11 +49,10 @@ build_uboot()
 {
 (
         handle_crosscompile
-        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10
+        test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch
-        git reset --hard origin/x2r10g10b10; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/v2-console-usb-kbd-Limit-poll-frequency-to-improve-performance.diff | patch -p1
+        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         make apple_m1_defconfig
         make -j `nproc`
 )
@@ -156,10 +154,15 @@ EOF
 
 build_asahi_installer_image()
 {
-        rm -rf esp
-        mkdir esp
-        mv EFI esp/
-        zip -r9 debian-base.zip esp media
+(
+        rm -rf aii
+        mkdir -p aii/esp aii/m1n1
+        cp -a EFI aii/esp/
+        cp u-boot.bin aii/m1n1/boot.bin
+        ln media aii/media
+        cd aii
+        zip -r9 ../debian-base.zip esp m1n1 media
+)
 }
 
 build_di_stick()
@@ -193,7 +196,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
+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