X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/beb245fc9857e330ef46e6a155e653a4efbefa22..47298cbe3d33d8ff02f7e55dea84d1099ca06fbb:/bootstrap.sh?ds=sidebyside

diff --git a/bootstrap.sh b/bootstrap.sh
index ad0b1c4..0d143eb 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,6 +31,7 @@ build_uboot()
 )
 
         cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
 build_linux()
@@ -42,7 +43,8 @@ build_linux()
         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/m1-config-2022-01-27 > .config
+        curl -s https://tg.st/u/0wM8 | git am -
+        curl -s https://tg.st/u/config-2022-01-28 > .config
         make olddefconfig
         make -j 16 bindeb-pkg
 )
@@ -67,8 +69,7 @@ build_rootfs()
         sudo cp ../../files/resolv.conf etc/resolv.conf
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
-        sudo cp ../../files/eth0 etc/network/interfaces.d/
-        sudo cp ../../files/wlp1s0f0 etc/network/interfaces.d/
+        sudo cp ../../files/interfaces etc/network/interfaces
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'
@@ -99,7 +100,7 @@ build_live_stick()
 )
 }
 
-build_fs()
+build_dd()
 {
 (
         rm -f media
@@ -160,5 +161,5 @@ build_linux
 build_rootfs
 build_live_stick
 build_di_stick
-build_fs
+build_dd
 upload_artefacts