2
0
mirror of https://github.com/xcat2/xcat-dep.git synced 2026-09-12 04:26:25 +00:00

fix(elilo): set use_prebuilt via %ifarch + %if (drop || that older rpm mis-evaluates)

EL8/EL9 mock chroots run an older rpm that does not evaluate an || between a
string compare and an arithmetic test like EL10's rpm, so use_prebuilt stayed
unset on el9-ppc and the gnu-efi BuildRequires (absent on ppc) broke the build.
Use two independent %ifarch ppc64le / %if 0%{?rhel}==8 blocks instead.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst
2026-07-16 17:06:17 -03:00
parent 1abfdf5428
commit df28d848d3
+7 -1
View File
@@ -23,7 +23,13 @@ Source4: elilo-xcat-3.14-6.noarch.rpm
# gnu-efi toolchain layout does not support elilo's build: ppc64le (no x86 EFI toolchain) and
# EL8 (gnu-efi-devel places elf_x86_64_efi.lds under a path elilo's Makefile does not find).
# elilo-x64.efi is a noarch artifact, so the prebuilt is byte-identical to the compiled one.
%if "%{_host_cpu}" == "ppc64le" || 0%{?rhel} == 8
# Separate %ifarch / %if (NOT a single `... || ...` expression): the older rpm inside the EL8/EL9
# mock chroot does not evaluate an `||` between a string compare and an arithmetic test the way
# EL10's rpm does, which silently left use_prebuilt unset and pulled in the gnu-efi BuildRequires.
%ifarch ppc64le
%global use_prebuilt 1
%endif
%if 0%{?rhel} == 8
%global use_prebuilt 1
%endif
BuildRequires: gcc