X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/e29e8a9ea113eb6b4c5511b012df4bb350f5bac3..56f47b61fbc72aa7410e81658f4a8cfbad3882f6:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index ba03c1a..20b1c13 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# SPDX-License-Identifier: MIT
+
 set -x
 set -e
 
@@ -25,25 +27,28 @@ build_uboot()
         cd u-boot
         git fetch
         git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
+        cp ../linux/arch/arm64/boot/dts/apple/t8103.dtsi arch/arm/dts/t8103.dtsi
+        cp ../linux/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi arch/arm/dts/t8103-jxxx.dtsi
         make apple_m1_defconfig
         # it is normal that it runs on an error at the end
         make -j 16 || true
 )
 
         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()
 {
 (
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
         cd linux
         git fetch
-        git reset --hard origin/asahi; git clean -f -x -d
+        git reset --hard 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/config-2022-01-28 > .config
+        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config
         make olddefconfig
         make -j 16 bindeb-pkg
 )
@@ -68,8 +73,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'
@@ -149,15 +153,15 @@ upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin di-stick/vmlinuz k.deb
+        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb
 }
 
 mkdir -p build
 cd build
 
+build_linux
 build_m1n1
 build_uboot
-build_linux
 build_rootfs
 build_live_stick
 build_di_stick