[configs/releng] prebootloader -> efitools
Should be fixed FS#49314 first
This commit is contained in:
parent
068459537c
commit
908370a17e
@ -64,7 +64,7 @@ make_packages() {
|
|||||||
|
|
||||||
# Needed packages for x86_64 EFI boot
|
# Needed packages for x86_64 EFI boot
|
||||||
make_packages_efi() {
|
make_packages_efi() {
|
||||||
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "prebootloader" install
|
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "efitools" install
|
||||||
}
|
}
|
||||||
|
|
||||||
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
|
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
|
||||||
@ -146,8 +146,8 @@ make_isolinux() {
|
|||||||
# Prepare /EFI
|
# Prepare /EFI
|
||||||
make_efi() {
|
make_efi() {
|
||||||
mkdir -p ${work_dir}/iso/EFI/boot
|
mkdir -p ${work_dir}/iso/EFI/boot
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi
|
cp ${work_dir}/x86_64/airootfs/usr/lib/efitools/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/
|
cp ${work_dir}/x86_64/airootfs/usr/lib/efitools/HashTool.efi ${work_dir}/iso/EFI/boot/
|
||||||
|
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/iso/EFI/boot/loader.efi
|
cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/iso/EFI/boot/loader.efi
|
||||||
|
|
||||||
@ -182,8 +182,8 @@ make_efiboot() {
|
|||||||
cp ${work_dir}/iso/${install_dir}/boot/intel_ucode.img ${work_dir}/efiboot/EFI/archiso/intel_ucode.img
|
cp ${work_dir}/iso/${install_dir}/boot/intel_ucode.img ${work_dir}/efiboot/EFI/archiso/intel_ucode.img
|
||||||
|
|
||||||
mkdir -p ${work_dir}/efiboot/EFI/boot
|
mkdir -p ${work_dir}/efiboot/EFI/boot
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
|
cp ${work_dir}/x86_64/airootfs/usr/lib/efitools/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/
|
cp ${work_dir}/x86_64/airootfs/usr/lib/efitools/HashTool.efi ${work_dir}/efiboot/EFI/boot/
|
||||||
|
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi
|
cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user