more notes

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 26464788e5736a30fb5911fd0f554afb56fe9825..931d5fe97a2dba5849242f6da8e1b0a7e04ed156 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,8 +32,8 @@ build_linux()
         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`)) V=0 bindeb-pkg &> /dev/null
 )
@@ -46,7 +46,7 @@ build_m1n1()
         cd m1n1
         git fetch
         git reset --hard origin/main; git clean -f -x -d &> /dev/null
-        make -j $(( 2* `nproc`))
+        make -j $(( 2* `nproc`)) &> /dev/null
 )
 }
 
@@ -60,7 +60,7 @@ build_uboot()
         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,7 +142,8 @@ 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/wpa.conf initrd/etc/
+        sudo cp ../files/wifi.sh initrd/
+        sudo cp ../files/boot.sh initrd/
         (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz)
         sudo rm -rf initrd
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi
@@ -159,7 +160,7 @@ upload()
         for FILE in "$@"; do
                 MYCURLARGS="$MYCURLARGS -F file=@${FILE}";
         done;
-        curl -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
+        curl -4 -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
 }
 
 upload_artefacts()