summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@gmail.com>2016-05-12 22:09:39 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@gmail.com>2016-05-12 22:09:45 -0300
commit908370a17e6f9e64b38e9763db9357f0020ed1d9 (patch)
treefcc06489e93655720b9d0e8033dd564e1ec52f1d
parent068459537cc937104b633ce5fffda1a1d04f5ab2 (diff)
downloadarchiso32-908370a17e6f9e64b38e9763db9357f0020ed1d9.tar.xz
[configs/releng] prebootloader -> efitools
Should be fixed FS#49314 first
-rwxr-xr-xconfigs/releng/build.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 7bacb3f..5b927b3 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -64,7 +64,7 @@ make_packages() {
# Needed packages for x86_64 EFI boot
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)
@@ -146,8 +146,8 @@ make_isolinux() {
# Prepare /EFI
make_efi() {
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/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/
+ 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/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
@@ -182,8 +182,8 @@ make_efiboot() {
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
- 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/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/
+ 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/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