imrpove scripts

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index e1815edc23da90a2717248b45f1cf8975a359586..a4bf7af63cd36803f8092d729db95382ed6f6350 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,23 +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 -
-
-        # CPUFREQ patches
-        curl -s https://tg.st/u/0001-MAINTAINERS-apple-Add-apple-mcc-and-clk-apple-cluste.patch | git am -
-        curl -s https://tg.st/u/0002-dt-bindings-memory-controller-Add-apple-mcc-binding.patch | git am -
-        curl -s https://tg.st/u/0003-dt-bindings-clock-Add-apple-cluster-clk-binding.patch | git am -
-        curl -s https://tg.st/u/0004-opp-core-Don-t-warn-if-required-OPP-device-does-not-.patch | git am -
-        curl -s https://tg.st/u/0005-PM-domains-Add-of_genpd_add_provider_simple_noclk.patch | git am -
-        curl -s https://tg.st/u/0006-memory-apple-Add-apple-mcc-driver-to-manage-MCC-perf.patch | git am -
-        curl -s https://tg.st/u/0007-clk-apple-Add-clk-apple-cluster-driver-to-manage-CPU.patch | git am -
-        curl -s https://tg.st/u/0008-arm64-apple-Select-MEMORY-and-APPLE_MCC.patch | git am -
-        curl -s https://tg.st/u/0009-arm64-apple-Add-CPU-frequency-scaling-support-for-t8.patch | git am -
-
-        # Remove power-domains = mcc
-        curl -s https://tg.st/u/0001-arch-arm64-apple-t8103-Remove-invalid-clk_pcluster-p.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
 )
@@ -157,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
@@ -174,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()
@@ -189,11 +175,11 @@ 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
 
-build_linux
-build_m1n1
-build_uboot
-build_rootfs
-build_live_stick
+# build_linux
+# build_m1n1
+# build_uboot
+# build_rootfs
+# build_live_stick
 build_di_stick
-build_dd
-upload_artefacts
+# build_dd
+# upload_artefacts