reorder put build_linux on top because it now is the first step

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 768fb5f4cd6e01a213b31a2e7e09c7be8c0a87a2..df60477a91f3a7c21c0c89bfb95644e31edd341d 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,6 +8,25 @@ set -e
 unset LC_CTYPE
 unset LANG
 
+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
+        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
+
+        make olddefconfig
+        make -j $(( 2* `nproc`)) bindeb-pkg
+)
+}
+
 build_m1n1()
 {
 (
@@ -15,45 +34,26 @@ build_m1n1()
         cd m1n1
         git fetch
         git reset --hard origin/main; git clean -f -x -d
-        make -j 16
+        make -j $(( 2* `nproc`))
 )
 }
 
 build_uboot()
 {
 (
-        # Build u-boot
         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
+        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 16
+        make -j $(( 2* `nproc`))
 )
 
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
         cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
-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
-        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/m1-config-smc-2022-02-06 > .config
-        curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
-        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
-
-        make olddefconfig
-        make -j 16 bindeb-pkg
-)
-}
-
 build_rootfs()
 {
 (
@@ -148,7 +148,6 @@ upload()
         curl -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
 }
 
-
 upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`