root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix aarch64 iso creation

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-09 20:32:52 +01:00
parent 804cda1628
commit d5964e760e
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/bin/archboot-aarch64-iso.sh
View file

@ -10,10 +10,10 @@ _aarch64_check
_config
echo "Starting ISO creation ..."
_prepare_kernel_initramfs_files
_prepare_fedora_shim_bootloaders_aarch64 >/dev/null 2>&1 || exit 1
_prepare_efitools_uefi >/dev/null 2>&1 || exit 1
_prepare_uefi_AA64_GRUB_USB_files >/dev/null 2>&1 || exit 1
_prepare_uefi_image >/dev/null 2>&1 || exit 1
_prepare_fedora_shim_bootloaders_aarch64 || exit 1
_prepare_efitools_uefi || exit 1
_prepare_uefi_AA64_GRUB_USB_files || exit 1
_prepare_uefi_image || exit 1
_grub_mkrescue || exit 1
_create_cksum || exit 1
_cleanup_iso || exit 1

12
usr/bin/archboot-x86_64-iso.sh
View file

@ -10,12 +10,12 @@ _x86_64_check
_config
echo "Starting ISO creation ..."
_prepare_kernel_initramfs_files
_prepare_fedora_shim_bootloaders_x86_64 >/dev/null 2>&1 || exit 1
_download_uefi_shell_tianocore >/dev/null 2>&1 || exit 1
_prepare_efitools_uefi >/dev/null 2>&1 || exit 1
_prepare_uefi_X64_GRUB_USB_files >/dev/null 2>&1 || exit 1
_prepare_uefi_IA32_GRUB_USB_files >/dev/null 2>&1 || exit 1
_prepare_uefi_image >/dev/null 2>&1 || exit 1
_prepare_fedora_shim_bootloaders_x86_64 || exit 1
_download_uefi_shell_tianocore || exit 1
_prepare_efitools_uefi || exit 1
_prepare_uefi_X64_GRUB_USB_files || exit 1
_prepare_uefi_IA32_GRUB_USB_files || exit 1
_prepare_uefi_image || exit 1
_grub_mkrescue || exit 1
_create_cksum || exit 1
_cleanup_iso || exit 1

7
usr/lib/archboot/iso_functions
View file

@ -48,7 +48,7 @@ _prepare_kernel_initramfs_files() {
echo "Prepare kernel and initramfs ..."
#shellcheck disable=SC1090
source "${_PRESET}"
mkdir -p "${_ISODIR}/EFI/BOOT"
mkdir -p "${_ISODIR}"/EFI/{BOOT,tools}
mkdir -p "${_ISODIR}/boot"
# fix for mkinitcpio 31
# https://bugs.archlinux.org/task/72882
@ -89,13 +89,12 @@ _prepare_fedora_shim_bootloaders_aarch64 () {
_prepare_efitools_uefi () {
echo "Prepare efitools ..."
cp -f "/usr/share/efitools/efi/HashTool.efi" "${_ISODIR}/EFI/tools/HashTool.efi"
cp -f "/usr/share/efitools/efi/KeyTool.efi" "${_ISODIR}/EFI/tools/KeyTool.efi"
cp "/usr/share/efitools/efi/HashTool.efi" "${_ISODIR}/EFI/tools/HashTool.efi"
cp "/usr/share/efitools/efi/KeyTool.efi" "${_ISODIR}/EFI/tools/KeyTool.efi"
}
_download_uefi_shell_tianocore() {
echo "Prepare uefi shells ..."
mkdir -p "${_ISODIR}/EFI/tools/"
## Install Tianocore UDK/EDK2 ShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. >=2.3 systems
cp /usr/share/edk2-shell/x64/Shell.efi "${_ISODIR}/EFI/tools/shellx64_v2.efi"
## Install Tianocore UDK/EDK2 EdkShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. <2.3 systems