X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/d1c22d9cba89bd08ed20f363151387b935ccb72b..41550f2fe565b39e879078954d2f130057681373:/bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh index 20b1c13..776f1da 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -8,57 +8,71 @@ set -e unset LC_CTYPE unset LANG +export DEBOOTSTRAP=debootstrap + +handle_crosscompile() +{ + if [ "`uname -m`" != 'aarch64' ]; then + export ARCH=arm64 + export CROSS_COMPILE=aarch64-linux-gnu- + export DEBOOTSTRAP=qemu-debootstrap + fi +} + +build_linux() +{ +( + handle_crosscompile + test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi + 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 + make olddefconfig + make -j $(( 2* `nproc`)) V=0 bindeb-pkg +) +} + build_m1n1() { ( test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git cd m1n1 git fetch - git reset --hard origin/main; git clean -f -x -d - make -j 16 + git reset --hard origin/main; git clean -f -x -d &> /dev/null + make -j $(( 2* `nproc`)) ) } build_uboot() { ( - # Build u-boot - test -d u-boot || git clone https://github.com/kettenis/u-boot + handle_crosscompile + test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10 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 + 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 - # it is normal that it runs on an error at the end - make -j 16 || true + make -j $(( 2* `nproc`)) ) - 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 -b smc/work - cd linux - git fetch - 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/m1-config-smc-2022-02-06 > .config - make olddefconfig - make -j 16 bindeb-pkg -) + 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 } 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,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` @@ -77,7 +91,7 @@ build_rootfs() sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf sudo bash -c 'chroot . apt update' - sudo bash -c 'chroot . apt install -y firmware-linux-free' + sudo bash -c 'chroot . apt install -y firmware-linux' sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd @@ -128,7 +142,8 @@ build_di_stick() sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet) sudo rm -rf initrd/lib/modules/* sudo cp -a testing/lib/modules/* initrd/lib/modules/ - sudo cp ../files/wpa.conf initrd/etc/ + sudo cp ../files/wifi.sh initrd/ + sudo cp ../files/boot.sh initrd/ (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz) sudo rm -rf initrd cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi @@ -139,26 +154,18 @@ 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 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/ } 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 + build_linux build_m1n1 build_uboot @@ -166,4 +173,4 @@ build_rootfs build_live_stick build_di_stick build_dd -upload_artefacts +publish_artefacts