From 396cee89bfda5acd371c4c5daf23c950a66a3bbc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 22 Feb 2018 16:40:30 -0800 Subject: [PATCH] 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 --- share/templates.d/99-generic/live/x86.tmpl | 2 +- share/templates.d/99-generic/x86.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/templates.d/99-generic/live/x86.tmpl b/share/templates.d/99-generic/live/x86.tmpl index 211001a6..9290dbb7 100644 --- a/share/templates.d/99-generic/live/x86.tmpl +++ b/share/templates.d/99-generic/live/x86.tmpl @@ -76,7 +76,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %if exists("boot/efi/EFI/*/gcdx64.efi"): <% efiarch64 = 'X64' %> %endif -%if efiarch32 or efiarch64 and basearch != 'i386': +%if (efiarch32 or efiarch64) and basearch != 'i386': <% efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) images = ["images/efiboot.img"] diff --git a/share/templates.d/99-generic/x86.tmpl b/share/templates.d/99-generic/x86.tmpl index 0fd0bbfe..1b0a9405 100644 --- a/share/templates.d/99-generic/x86.tmpl +++ b/share/templates.d/99-generic/x86.tmpl @@ -78,7 +78,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %if exists("boot/efi/EFI/*/gcdx64.efi"): <% efiarch64 = 'X64' %> %endif -%if efiarch32 or efiarch64 and basearch != 'i386': +%if (efiarch32 or efiarch64) and basearch != 'i386': <% efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) images = ["images/efiboot.img"]