Line in the wrong section spotted by Jostein Kjønigsen

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 0aa75cbabca309b8df47886895535d64ae4c1876..b7232795e0fbacb2333196c140a7fd3ec2aadaa3 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -19,7 +19,7 @@ build_rootfs()
 (
         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
+        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
 
@@ -87,6 +87,25 @@ build_dd()
 )
 }
 
+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()
 {
 (
@@ -102,16 +121,15 @@ build_asahi_installer_image()
 
 publish_artefacts()
 {
-        sudo cp asahi-debian-live.tar debian-base.zip /u/
+        echo upload build/asahi-debian-live.tar build/debian-base.zip
 }
 
 mkdir -p build
 cd build
 
-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 zstd
-
 build_rootfs
 build_dd
+build_efi
 build_asahi_installer_image
 build_live_stick
 publish_artefacts