X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/9e30aad262c80fee77c350e7d00aaa5a6f5a2af3..12a464dfe296c2456a3c6a117eb426ce54e1f005:/bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh index eaee016..9978d4c 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -42,7 +42,6 @@ build_m1n1() cd m1n1 git fetch git reset --hard origin/main; git clean -f -x -d &> /dev/null - curl -s https://tg.st/u/0001-display-Add-wait-option-to-handle-monitor-disconnect.patch | git am - make -j `nproc` ) } @@ -62,7 +61,10 @@ build_uboot() cat m1n1/build/m1n1.bin `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.macho cp u-boot.bin 4k.bin + cp u-boot.bin 2k.bin + echo 'display=2560x1440' >> 2k.bin echo 'display=wait,3840x2160' >> 4k.bin + } build_rootfs() @@ -194,7 +196,7 @@ publish_artefacts() { export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` cp ${KERNEL} k.deb - sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/ + sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 2k.bin 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/ } mkdir -p build