Really don't try to build EFI images on i386

The previous attempt to fix this failed because of operator
ordering, so we actually still tried to build EFI images on
i386, so i386 lives failed. This really fixes it. I tested. I
actually built a 32-bit live and it worked.

Resolves: rhbz#1539085

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-02-22 16:40:30 -08:00 committed by Brian C. Lane
parent 80ed94dc06
commit 396cee89bf
2 changed files with 2 additions and 2 deletions

View File

@ -76,7 +76,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%if exists("boot/efi/EFI/*/gcdx64.efi"): %if exists("boot/efi/EFI/*/gcdx64.efi"):
<% efiarch64 = 'X64' %> <% efiarch64 = 'X64' %>
%endif %endif
%if efiarch32 or efiarch64 and basearch != 'i386': %if (efiarch32 or efiarch64) and basearch != 'i386':
<% <%
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
images = ["images/efiboot.img"] images = ["images/efiboot.img"]

View File

@ -78,7 +78,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%if exists("boot/efi/EFI/*/gcdx64.efi"): %if exists("boot/efi/EFI/*/gcdx64.efi"):
<% efiarch64 = 'X64' %> <% efiarch64 = 'X64' %>
%endif %endif
%if efiarch32 or efiarch64 and basearch != 'i386': %if (efiarch32 or efiarch64) and basearch != 'i386':
<% <%
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
images = ["images/efiboot.img"] images = ["images/efiboot.img"]