Line in the wrong section spotted by Jostein Kjønigsen

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100644 (file)
new mode 100755 (executable)
index 775ac10..b723279
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,53 +1,135 @@
-#!/bin/bash
+#!/usr/bin/env bash

 
 

-set -x
-set -e
+# SPDX-License-Identifier: MIT
+
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
+cd "$(dirname "$0")"

 
 unset LC_CTYPE
 unset LANG
 
 
 unset LC_CTYPE
 unset LANG
 

-build_m1n1()
+export DEBOOTSTRAP=debootstrap
+
+build_rootfs()

 {
 (
 {
 (

-        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
+        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,wireless-regdb,zstd stable testing http://deb.debian.org/debian
+
+        cd testing
+
+        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'
+
+        sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
+
+        sudo -- ln -s lib/systemd/systemd init
+
+        sudo chroot . apt update
+        sudo chroot . apt install -y m1n1 linux-image-asahi
+        sudo chroot . apt clean
+        sudo rm var/lib/apt/lists/* || true

 )
 }
 
 )
 }
 

-build_uboot()
+build_live_stick()

 {
 (
 {
 (

-        # Build u-boot
-        test -d u-boot || git clone https://github.com/kettenis/u-boot
-        cd u-boot
-        git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
-        make apple_m1_defconfig
-        # it is normal that it runs on an error at the end
-        make -j 16 || true
+        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 | 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
+        (cd live-stick; tar cf ../asahi-debian-live.tar .)

 )
 )

+}

 
 

-        cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
+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()
+{
+(
+        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 <<EOF
+search.fs_uuid ${UUID} root
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw net.ifnames=0
+initrd (\$root)/boot/${INITRD}
+boot
+EOF
+)
+}
+
+build_asahi_installer_image()
+{
+(
+        rm -rf aii
+        mkdir -p aii/esp/m1n1
+        cp -a EFI aii/esp/
+        cp testing/usr/lib/m1n1/boot.bin aii/esp/m1n1/boot.bin
+        ln media aii/media
+        cd aii
+        zip -r9 ../debian-base.zip esp media
+)
+}
+
+publish_artefacts()
+{
+        echo upload build/asahi-debian-live.tar build/debian-base.zip

 }
 
 }
 

+mkdir -p build
+cd build

 
 

-# # Build our boot object that replaces step2.sh in the asahi installer
-# 
-# # Build Linux
-# git clone https://github.com/AsahiLinux/linux
-# cd linux
-# git checkout origin/asahi
-# # SPI patches
-# curl https://tg.st/u/aa6a11b3feeda0f57284f99406188e4615e7c43c.patch | patch -p1
-# curl https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | patch -p1
-# # Sound patch
-# curl https://tg.st/u/5nly | patch -p1
-# # Config with sound enabled
-# curl https://tg.st/u/asahi-config-2022-01-19 > .config
-# make olddefconfig
-# make bindeb-pkg
-
-# build_m1n1
-build_uboot
+build_rootfs
+build_dd
+build_efi
+build_asahi_installer_image
+build_live_stick
+publish_artefacts