X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/0bffa1b014fafea1080904cce9050825ab2846c9..36d068ea86533b1fd4eae14df2dc245ba61071a8:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 0c231b5..210a0b9 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -26,16 +26,16 @@ build_linux()
         test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
         cd linux
         git fetch
-        git reset --hard origin/smc/work; git clean -f -x -d
+        git reset --hard origin/smc/work; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
         curl -s https://tg.st/u/5nly | git am -
         curl -s https://tg.st/u/0wM8 | git am -
         curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
         curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
-        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config
-
+        curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
+        curl -s https://tg.st/u/config-2022-02-13 > .config
         make olddefconfig
-        make -j $(( 2* `nproc`)) bindeb-pkg
+        make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
 )
 }
 
@@ -45,8 +45,8 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch
-        git reset --hard origin/main; git clean -f -x -d
-        make -j $(( 2* `nproc`))
+        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        make -j $(( 2* `nproc`)) &> /dev/null
 )
 }
 
@@ -57,10 +57,10 @@ build_uboot()
         test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10
         cd u-boot
         git fetch
-        git reset --hard origin/x2r10g10b10; git clean -f -x -d
+        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
         make apple_m1_defconfig
-        make -j $(( 2* `nproc`))
+        make -j $(( 2* `nproc`)) &> /dev/null
 )
 
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
@@ -142,6 +142,7 @@ build_di_stick()
         sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet)
         sudo rm -rf initrd/lib/modules/*
         sudo cp -a testing/lib/modules/* initrd/lib/modules/
+        sudo cp ../files/preseed.cfg initrd/
         sudo cp ../files/wpa.conf initrd/etc/
         (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz)
         sudo rm -rf initrd