X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/46ef70c57a4e7084e70200d2c333ef02c901eb44..0c2252281a3014c5458429c9834b794ba944d17f:/bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh index 99690d8..2237aff 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,31 +23,14 @@ build_linux() { ( handle_crosscompile - test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work + test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi cd linux git fetch - git reset --hard origin/smc/work; git clean -f -x -d &> /dev/null - 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 - - - # CPUFREQ patches - curl -s https://tg.st/u/0001-MAINTAINERS-apple-Add-apple-mcc-and-clk-apple-cluste.patch | git am - - curl -s https://tg.st/u/0002-dt-bindings-memory-controller-Add-apple-mcc-binding.patch | git am - - curl -s https://tg.st/u/0003-dt-bindings-clock-Add-apple-cluster-clk-binding.patch | git am - - curl -s https://tg.st/u/0004-opp-core-Don-t-warn-if-required-OPP-device-does-not-.patch | git am - - curl -s https://tg.st/u/0005-PM-domains-Add-of_genpd_add_provider_simple_noclk.patch | git am - - curl -s https://tg.st/u/0006-memory-apple-Add-apple-mcc-driver-to-manage-MCC-perf.patch | git am - - curl -s https://tg.st/u/0007-clk-apple-Add-clk-apple-cluster-driver-to-manage-CPU.patch | git am - - curl -s https://tg.st/u/0008-arm64-apple-Select-MEMORY-and-APPLE_MCC.patch | git am - - curl -s https://tg.st/u/0009-arm64-apple-Add-CPU-frequency-scaling-support-for-t8.patch | git am - - - curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config - + git reset --hard origin/asahi; git clean -f -x -d &> /dev/null + curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am - + curl -s https://tg.st/u/config-2022-03-09-4k > .config make olddefconfig - make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null + make -j `nproc` V=0 bindeb-pkg > /dev/null ) } @@ -58,7 +41,7 @@ build_m1n1() cd m1n1 git fetch git reset --hard origin/main; git clean -f -x -d &> /dev/null - make -j $(( 2* `nproc`)) + make -j `nproc` ) } @@ -66,13 +49,13 @@ build_uboot() { ( handle_crosscompile - test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10 + test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot cd u-boot git fetch git reset --hard origin/x2r10g10b10; git clean -f -x -d &> /dev/null 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 $(( 2* `nproc`)) + make -j `nproc` ) cat m1n1/build/m1n1.bin `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin @@ -84,12 +67,15 @@ build_rootfs() ( handle_crosscompile sudo rm -rf testing - sudo eatmydata ${DEBOOTSTRAP} --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian + mkdir -p cache + sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools testing testing http://ftp.fau.de/debian export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` cd testing + sudo mkdir -p boot/efi + sudo bash -c 'echo live > etc/hostname' sudo bash -c 'echo > etc/motd' @@ -97,10 +83,10 @@ build_rootfs() sudo cp ../../files/sources.list etc/apt/sources.list sudo cp ../../files/hosts etc/hosts sudo cp ../../files/resolv.conf etc/resolv.conf - sudo cp ../../files/fstab etc/fstab sudo cp ../../files/quickstart.txt root/ sudo cp ../../files/interfaces etc/network/interfaces sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf + sudo cp ../../files/rc.local etc/rc.local sudo bash -c 'chroot . apt update' sudo bash -c 'chroot . apt install -y firmware-linux' @@ -113,7 +99,7 @@ build_rootfs() sudo chroot . dpkg -i ${KERNEL} sudo rm ${KERNEL} - sudo bash -c 'apt-get clean' + sudo bash -c 'chroot . apt-get clean' ) } @@ -122,7 +108,8 @@ build_live_stick() ( rm -rf live-stick mkdir -p live-stick/efi/boot live-stick/efi/debian/ - sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz > ../live-stick/initrd.gz' + sudo cp ../files/wifi.pl testing/etc/rc.local + sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz -9 > ../live-stick/initrd.gz' cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi cp testing/boot/vmlinuz* live-stick/vmlinuz cp ../files/grub.cfg live-stick/efi/debian/grub.cfg @@ -142,20 +129,50 @@ build_dd() sudo cp -a testing/* mnt/ sudo rm mnt/init sudo umount mnt - tar cf - media | pigz > m1.tgz + tar cf - media | pigz -9 > m1.tgz +) +} + +build_efi() +{ +( + rm -rf EFI + mkdir -p EFI/boot EFI/debian + cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi + + export INITRD=`ls -1 testing/boot/ | grep initrd` + export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz` + export UUID=`blkid media | awk -F\" '{print $2}'` + cat > EFI/debian/grub.cfg < ../di-stick/initrd.gz) + sudo cp ../files/wifi.sh initrd/ + sudo cp ../files/boot.sh initrd/ + (cd initrd; find . | cpio --quiet -H newc -o | pigz -9 > ../di-stick/initrd.gz) sudo rm -rf initrd cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi cp testing/boot/vmlinuz* di-stick/vmlinuz @@ -165,32 +182,25 @@ build_di_stick() (cd di-stick; tar cf ../m1-d-i.tar .) } -upload() -{ - unset MYCURLARGS; - for FILE in "$@"; do - MYCURLARGS="$MYCURLARGS -F file=@${FILE}"; - done; - curl -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}' -} - -upload_artefacts() +publish_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 u-boot.macho di-stick/vmlinuz k.deb + sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz 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 cd build -sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support +sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves build_linux build_m1n1 build_uboot build_rootfs -build_live_stick build_di_stick build_dd -upload_artefacts +build_efi +build_asahi_installer_image +build_live_stick +publish_artefacts