diff options
| author | Erich Eckner <git@eckner.net> | 2017-03-26 20:28:34 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-02-14 14:55:51 +0100 |
| commit | ff50a686c93c171998f82c4124c74f1b6e1621ba (patch) | |
| tree | bee320e0cccddabc5b947c86c0304b3781295e06 | |
| parent | 9e173b21b2d2fccc06a21adb0e2cffdc21400f9f (diff) | |
| download | archiso32-ff50a686c93c171998f82c4124c74f1b6e1621ba.tar.xz | |
pendent to "01b54d2": [configs/releng] Do not build i686
| -rwxr-xr-x | configs/releng/build.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 3600f81..dfb2e01 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -207,8 +207,8 @@ make_isolinux() { # Prepare /EFI make_efi() { mkdir -p "${work_dir}/iso/EFI/boot" - cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \ - "${work_dir}/iso/EFI/boot/bootx64.efi" + cp "${work_dir}/i686/airootfs/usr/lib/systemd/boot/efi/systemd-bootia32.efi" \ + "${work_dir}/iso/EFI/boot/bootia32.efi" mkdir -p "${work_dir}/iso/loader/entries" cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/" @@ -233,15 +233,15 @@ make_efiboot() { mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot" mkdir -p "${work_dir}/efiboot/EFI/archiso" - cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/archiso/vmlinuz.efi" - cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" + cp "${work_dir}/iso/${install_dir}/boot/i686/vmlinuz" "${work_dir}/efiboot/EFI/archiso/vmlinuz.efi" + cp "${work_dir}/iso/${install_dir}/boot/i686/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" 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/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img" mkdir -p "${work_dir}/efiboot/EFI/boot" - cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \ - "${work_dir}/efiboot/EFI/boot/bootx64.efi" + cp "${work_dir}/i686/airootfs/usr/lib/systemd/boot/efi/systemd-bootia32.efi" \ + "${work_dir}/efiboot/EFI/boot/bootia32.efi" mkdir -p "${work_dir}/efiboot/loader/entries" cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/" @@ -312,19 +312,19 @@ mkdir -p "${work_dir}" run_once make_pacman_conf # Do all stuff for each airootfs -for arch in i686 x86_64; do +for arch in i686; do run_once make_custom_airootfs run_once make_packages done run_once make_packages_efi -for arch in i686 x86_64; do +for arch in i686; do run_once make_setup_mkinitcpio run_once make_customize_airootfs done -for arch in i686 x86_64; do +for arch in i686; do run_once make_boot done @@ -335,7 +335,7 @@ run_once make_isolinux run_once make_efi run_once make_efiboot -for arch in i686 x86_64; do +for arch in i686; do run_once make_prepare done |