X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/808831b6b1e4f850a027663225572e76b2615a52..01cd7ce3e84889067b2674e3207c007c93b9e523:/bootstrap.sh diff --git a/bootstrap.sh b/bootstrap.sh index 1ff99c8..b723279 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -14,94 +14,34 @@ unset LANG export DEBOOTSTRAP=debootstrap -<<<<<<< HEAD -======= -handle_crosscompile() -{ - if [ "`uname -m`" != 'aarch64' ]; then - export ARCH=arm64 - export CROSS_COMPILE=aarch64-linux-gnu- - export DEBOOTSTRAP=qemu-debootstrap - sudo apt install -y libc6-dev-arm64-cross - fi -} - -build_linux() -{ -( - handle_crosscompile - test -d linux || git clone https://github.com/AsahiLinux/linux - cd linux - git fetch -a -t - git reset --hard asahi-6.1-rc8-3; git clean -f -x -d &> /dev/null - cat ../../config-16k.txt > .config - make olddefconfig - make -j `nproc` V=0 bindeb-pkg > /dev/null -) -} - -build_m1n1() -{ -( - test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1 - cd m1n1 - git fetch -a -t - # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD - git reset --hard v1.2.3; git clean -f -x -d &> /dev/null - make -j `nproc` -) -} - -build_uboot() -{ -( - handle_crosscompile - test -d u-boot || git clone https://github.com/AsahiLinux/u-boot - cd u-boot - git fetch -a -t - # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD - git reset --hard asahi-v2022.10-1; git clean -f -x -d &> /dev/null - git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017 - - make apple_m1_defconfig - make -j `nproc` -) - - 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 - -} - ->>>>>>> 0469ea3ee783f57bd1b368502d3286d96064e6e1 build_rootfs() { ( - handle_crosscompile sudo rm -rf testing 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,cryptsetup testing testing http://deb.debian.org/debian - - export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` + 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,wireless-regdb,zstd stable testing http://deb.debian.org/debian cd testing - sudo mkdir -p boot/efi + sudo mkdir -p boot/efi/m1n1 etc/X11/xorg.conf.d 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/glanzmann.list etc/apt/sources.list.d/ + sudo cp ../../files/thomas-glanzmann.gpg etc/apt/trusted.gpg.d/ sudo cp ../../files/hosts etc/hosts sudo cp ../../files/resolv.conf etc/resolv.conf 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 cp ../../files/30-modeset.conf etc/X11/xorg.conf.d/30-modeset.conf + sudo cp ../../files/blacklist.conf etc/modprobe.d/ + + sudo perl -p -i -e 's/"quiet"/"net.ifnames=0"/ if /^GRUB_CMDLINE_LINUX_DEFAULT=/' etc/default/grub sudo bash -c 'chroot . apt update' sudo bash -c 'chroot . apt install -y firmware-linux' @@ -110,11 +50,10 @@ build_rootfs() sudo -- ln -s lib/systemd/systemd init - sudo cp ../${KERNEL} . - sudo chroot . dpkg -i ${KERNEL} - sudo rm ${KERNEL} - - sudo bash -c 'chroot . apt-get clean' + sudo chroot . apt update + sudo chroot . apt install -y m1n1 linux-image-asahi + sudo chroot . apt clean + sudo rm var/lib/apt/lists/* || true ) } @@ -124,7 +63,7 @@ build_live_stick() rm -rf live-stick mkdir -p live-stick/efi/boot live-stick/efi/debian/ 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' + sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | zstd -T0 -16 > ../live-stick/initrd.zstd' 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 @@ -132,6 +71,22 @@ build_live_stick() ) } +build_dd() +{ +( + rm -f media + 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 + sudo mount -o loop media mnt + sudo cp -a testing/* mnt/ + sudo rm -rf mnt/init mnt/boot/efi/m1n1 + sudo umount mnt + tar cf - media | pigz -9 > m1.tgz +) +} + build_efi() { ( @@ -144,11 +99,10 @@ build_efi() export UUID=`blkid -s UUID -o value media` cat > EFI/debian/grub.cfg <