here we go

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 9a7940cb3a680065d8c3035dee8331409c479f5d..0fec48172d4189766c97e0a31142793dcde9dc66 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,17 +23,18 @@ build_linux()
 {
 (
         handle_crosscompile
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
+        test -d linux || git clone --depth 1 https://github.com/jannau/linux -b spmi/work
         cd linux
         git fetch
-        git reset --hard origin/smc/work; git clean -f -x -d &> /dev/null
+        git reset --hard origin/spmi/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/0001-4k-iommu-patch.patch | git am -
-        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config
+        curl -s https://tg.st/u/0001-21-02-axboe-grabbing-anv-lock-around-the-issue-does-.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
 )
@@ -142,8 +143,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/preseed.cfg initrd/
-        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
@@ -160,7 +161,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()
@@ -178,8 +179,8 @@ sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu l
 build_linux
 build_m1n1
 build_uboot
-build_rootfs
-build_live_stick
-build_di_stick
-build_dd
-upload_artefacts
+# build_rootfs
+# build_live_stick
+# build_di_stick
+# build_dd
+# upload_artefacts