X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/f7f571f945fe5e5e810ae40721b2b71b88e9777c..4ca99176f87ab63b54bc3a9526325122ed3bd5a0:/bootstrap.sh?ds=sidebyside diff --git a/bootstrap.sh b/bootstrap.sh index 0fec481..4dab225 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -16,6 +16,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,31 +24,29 @@ build_linux() { ( handle_crosscompile - test -d linux || git clone --depth 1 https://github.com/jannau/linux -b spmi/work + test -d linux || git clone https://github.com/AsahiLinux/linux cd linux git fetch - git reset --hard origin/spmi/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 - - curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am - - curl -s https://tg.st/u/0001-21-02-axboe-grabbing-anv-lock-around-the-issue-does-.patch | git am - - curl -s https://tg.st/u/config-2022-02-13 > .config + git reset --hard asahi-5.19-3; git clean -f -x -d &> /dev/null + curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am - + curl -s https://tg.st/u/0001-4k-iommu-patch-2022-07-20.patch | git am - + curl -s https://tg.st/u/0001-jeys-patch.patch | git am - + curl -s https://tg.st/u/0001-jeys-2nd-patch.patch | git am - + cat ../../config-4k.txt > .config make olddefconfig - make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null + 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`)) &> /dev/null + 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` ) } @@ -55,17 +54,23 @@ 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 make apple_m1_defconfig - make -j $(( 2* `nproc`)) &> /dev/null + 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() @@ -73,23 +78,26 @@ 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,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk testing testing http://deb.debian.org/debian export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` cd testing - sudo bash -c 'echo live > etc/hostname' + sudo mkdir -p boot/efi + + sudo bash -c 'echo debian > etc/hostname' sudo bash -c 'echo > etc/motd' 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' @@ -102,7 +110,7 @@ build_rootfs() sudo chroot . dpkg -i ${KERNEL} sudo rm ${KERNEL} - sudo bash -c 'apt-get clean' + sudo bash -c 'chroot . apt-get clean' ) } @@ -111,7 +119,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 @@ -123,7 +132,7 @@ 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 media tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media @@ -131,7 +140,40 @@ 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 -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 @@ -155,32 +198,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 -4 -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 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 +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 build_linux build_m1n1 build_uboot -# build_rootfs -# build_live_stick -# build_di_stick -# build_dd -# upload_artefacts +build_rootfs +#build_di_stick +build_dd +build_efi +build_asahi_installer_image +build_live_stick +publish_artefacts