X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/5920ad39aca05765cd860523d6784286568877df..43e069d552a28a0062574f99146273ce8855a447:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 0bb00d4..7e01007 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -12,8 +12,8 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch
-        git reset --hard origin/master; git clean -f -x -d
-        make -j
+        git reset --hard origin/main; git clean -f -x -d
+        make -j 16
 )
 }
 
@@ -21,32 +21,35 @@ build_uboot()
 {
 (
         # Build u-boot
-        test -d u-boot | git clone https://github.com/kettenis/u-boot
+        test -d u-boot || git clone https://github.com/kettenis/u-boot
         cd u-boot
+        git fetch
         git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
         make apple_m1_defconfig
         # it is normal that it runs on an error at the end
-        make || true
+        make -j 16 || true
 )
 
         cat m1n1/build/m1n1.macho `find u-boot -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
+        cd linux
+        git fetch
+        git reset --hard origin/asahi; 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/asahi-config-2022-01-19 > .config
+        make olddefconfig
+        make -j 16 bindeb-pkg
+)
+}
+
+
 
-# # Build our boot object that replaces step2.sh in the asahi installer
-# 
-# # Build Linux
-# git clone https://github.com/AsahiLinux/linux
-# cd linux
-# git checkout origin/asahi
-# # SPI patches
-# curl https://tg.st/u/aa6a11b3feeda0f57284f99406188e4615e7c43c.patch | patch -p1
-# curl https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | patch -p1
-# # Sound patch
-# curl https://tg.st/u/5nly | patch -p1
-# # Config with sound enabled
-# curl https://tg.st/u/asahi-config-2022-01-19 > .config
-# make olddefconfig
-# make bindeb-pkg
-
-build_m1n1
+# build_m1n1
+# build_uboot
+build_linux