From: Thomas Glanzmann <thomas@glanzmann.de> Date: Wed, 23 Feb 2022 21:16:55 +0000 (+0100) Subject: create efi.tar X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/0ffed154936f329bcc1500e506f1d78c99b2d79e?hp=645502a5e7872222f74eaccec383484bcf2e3bf9 create efi.tar --- diff --git a/bootstrap.sh b/bootstrap.sh index fb8580b..32a760e 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -134,6 +134,27 @@ build_dd() ) } +build_efi() +{ +( + rm -f EFI + mkdir -p EFI/BOOT + 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=`disktype build/media | grep UUID | awk '{print $2}'` + cat > EFI/boot/grub.cfg <<EOF +search.fs_uuid ${UUID} root +set prefix=(\$root)'/boot/' +linux $VMLINUZ root=UUID=${UUID} ro +inird $INITRD +boot +EOF + tar czf efi.tgz EFI +) +} + build_di_stick() { rm -rf di-stick @@ -158,7 +179,7 @@ publish_artefacts() { export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` cp ${KERNEL} 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/ + sudo cp m1-d-i.tar m1.tgz efi.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 @@ -173,4 +194,5 @@ build_rootfs build_live_stick build_di_stick build_dd +build_efi publish_artefacts diff --git a/m1di.pl b/m1di.pl index 8c3b861..b55f8d2 100644 --- a/m1di.pl +++ b/m1di.pl @@ -56,7 +56,7 @@ system("mkdir -p /Volumes/efi"); system("mount -t msdos /dev/$identifier /Volumes/efi"); chdir('/Volumes/efi'); system('mkdir -p /Volumes/efi/efi/boot'); -system('curl -sL https://tg.st/efi.tar.gz | tar -xzf -'); +system('curl -sL https://tg.st/efi.tgz | tar -xzf -'); system('curl -sL tg.st/u/fwx.sh | bash'); system('cp /tmp/linux-firmware.tar /Volumes/efi/'); chdir('/var/root');