move ucode part to extra function

This commit is contained in:
Tobias Powalowski 2022-09-13 22:36:36 +02:00
parent 7018d6c78e
commit a8c60dbb19
4 changed files with 33 additions and 0 deletions

View file

@ -10,6 +10,7 @@ _aarch64_check
_config
echo "Starting ISO creation ..."
_prepare_kernel_initramfs_files || exit 1
_prepare_ucode || exit 1
_prepare_fedora_shim_bootloaders_aarch64 || exit 1
_prepare_efitools_uefi || exit 1
_prepare_uefi_AA64 || exit 1

22
usr/bin/archboot-riscv64-iso.sh Executable file
View file

@ -0,0 +1,22 @@
#!/usr/bin/env bash
# created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh
. /usr/lib/archboot/iso.sh
[[ -z "${1}" ]] && _usage
_parameters "$@"
_root_check
_riscv64_check
[[ "${_GENERATE}" == "1" ]] || _usage
_config
echo "Starting ISO creation ..."
_prepare_kernel_initramfs_files || exit 1
_prepare_uefi_RISCV64 || exit 1
_prepare_background || exit 1
_reproducibility
_prepare_uefi_image || exit 1
_reproducibility
_grub_mkrescue || exit 1
_reproducibility_iso || exit 1
_create_cksum || exit 1
_cleanup_iso || exit 1
echo "Finished ISO creation."

View file

@ -10,6 +10,7 @@ _x86_64_check
_config
echo "Starting ISO creation ..."
_prepare_kernel_initramfs_files || exit 1
_prepare_ucode || exit 1
_prepare_fedora_shim_bootloaders_x86_64 || exit 1
_prepare_uefi_shell_tianocore || exit 1
_prepare_efitools_uefi || exit 1

View file

@ -72,6 +72,9 @@ _prepare_kernel_initramfs_files() {
# add with .cer, cause of DELL firmware
mkdir -p "${_ISODIR}/EFI/KEY"
cp ${_KEYDIR}/MOK.CER "${_ISODIR}/EFI/KEY/MOK.cer"
}
_prepare_ucode() {
# install ucode files
[[ "${_RUNNING_ARCH}" == "aarch64" ]] || cp /boot/intel-ucode.img "${_ISODIR}/boot/"
cp /boot/amd-ucode.img "${_ISODIR}/boot/"
@ -140,6 +143,12 @@ _prepare_uefi_AA64() {
cp /usr/share/archboot/bootloader/grubaa64.efi "${_ISODIR}/EFI/BOOT/"
}
# build grubXXX with all modules: http://bugs.archlinux.org/task/71382
_prepare_uefi_RISCV64() {
echo "Prepare RISCV64 Grub ..."
cp /usr/share/archboot/bootloader/grubriscv64.efi "${_ISODIR}/EFI/BOOT/"
}
_prepare_background() {
echo "Prepare Grub background ..."
[[ -d "${_ISODIR}/boot/grub" ]] || mkdir -p "${_ISODIR}/boot/grub"