X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/35743f4436cfe1be50e684fe646f003624e8f8a4..c5e46692bf6e20fe6c5ce1eba86261cd71ca810d:/bootstrap.sh?ds=sidebyside diff --git a/bootstrap.sh b/bootstrap.sh old mode 100644 new mode 100755 index 5bfb47d..469fc88 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,9 +1,13 @@ -#!/bin/bash +#!/usr/bin/env bash # SPDX-License-Identifier: MIT -set -x -set -e +set -o errexit +set -o nounset +set -o pipefail +set -o xtrace + +cd "$(dirname "$0")" unset LC_CTYPE unset LANG @@ -16,6 +20,7 @@ handle_crosscompile() export ARCH=arm64 export CROSS_COMPILE=aarch64-linux-gnu- export DEBOOTSTRAP=qemu-debootstrap + sudo apt install -y libc6-dev-arm64-cross fi } @@ -23,29 +28,26 @@ build_linux() { ( handle_crosscompile - test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi + test -d linux || git clone https://github.com/AsahiLinux/linux cd linux - git fetch - 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/DXyl.patch | git am - - curl -s https://tg.st/u/0001-apple-mca-correct-prinkts.patch | git am - - curl -s https://tg.st/u/0001-Hookup-backlight-for-MacBook-Pro-13-inch-M1-2020-J29.patch | git am - - curl -s https://tg.st/u/XKVZ.patch | git am - - curl -s https://tg.st/u/config-2022-02-19 > .config + git fetch -a -t + git reset --hard asahi-6.0-rc6-1; git clean -f -x -d &> /dev/null + curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am - + cat ../../config-16k.txt > .config make olddefconfig - make -j $(( 2* `nproc`)) V=0 bindeb-pkg + make -j `nproc` V=0 bindeb-pkg > /dev/null ) } build_m1n1() { ( - test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git + test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1 cd m1n1 - git fetch - git reset --hard origin/main; git clean -f -x -d &> /dev/null - make -j $(( 2* `nproc`)) + git fetch -a -t + # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD + git reset --hard v1.1.4; git clean -f -x -d &> /dev/null + make -j `nproc` ) } @@ -53,17 +55,25 @@ 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 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 + git fetch -a -t + # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD + git reset --hard asahi-v2022.07-3; git clean -f -x -d &> /dev/null + git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017 + curl -s https://tg.st/u/0001-usb_setup_descriptor-Add-1ms-delay-in-order-to-unbre.patch | git am - + 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 - cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho + 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() @@ -72,7 +82,7 @@ build_rootfs() handle_crosscompile sudo rm -rf testing 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 + sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` @@ -80,7 +90,7 @@ build_rootfs() sudo mkdir -p boot/efi - sudo bash -c 'echo live > etc/hostname' + sudo bash -c 'echo debian > etc/hostname' sudo bash -c 'echo > etc/motd' @@ -103,7 +113,7 @@ build_rootfs() sudo chroot . dpkg -i ${KERNEL} sudo rm ${KERNEL} - sudo bash -c 'apt-get clean' + sudo bash -c 'chroot . apt-get clean' ) } @@ -112,7 +122,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 @@ -124,15 +135,15 @@ build_dd() { ( rm -f media - dd if=/dev/zero of=media bs=1 count=0 seek=1G + dd if=/dev/zero of=media bs=1 count=0 seek=2G mkdir -p mnt - mkfs.ext4 -O ^metadata_csum media + mkfs.ext4 media tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media sudo mount -o loop media mnt 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 ) } @@ -145,7 +156,7 @@ build_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}'` + export UUID=`blkid -s UUID -o value media` cat > EFI/debian/grub.cfg < ../di-stick/initrd.gz) + (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 @@ -181,20 +205,26 @@ 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 di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi /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 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 rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev +sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev 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 clang-14 lld-14 llvm-14 curl build_linux build_m1n1 build_uboot + +exit + build_rootfs -build_live_stick -build_di_stick +#build_di_stick build_dd build_efi +build_asahi_installer_image +build_live_stick publish_artefacts + +echo 'Reminder: On the next release publish __all__ kernel packages'