From 6e913757e8ca5a8d30c8cfb3bd419299178c72dd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 25 Jun 2024 23:39:29 -0400 Subject: [PATCH] Build tftpboot and nonlinux on x86_64 RHEL 10 and later, including ELN, no longer build for i686. The tftpboot and nonlinux artifacts can be built on x86_64 with glibc32 and gcc -m32, with both mingw32-gcc and mingw64-gcc to produce both EXEs. Resolves: RHEL-49795 --- syslinux.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/syslinux.spec b/syslinux.spec index a2e49fc..4600da5 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -10,7 +10,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem Name: syslinux Version: 6.04 %define tarball_version 6.04-pre1 -Release: 0.28%{?dist} +Release: 0.29%{?dist} License: GPL-2.0-or-later URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz @@ -44,7 +44,7 @@ BuildRequires: mingw32-gcc %endif %ifarch x86_64 Requires: mtools, libc.so.6()(64bit) -BuildRequires: mingw64-gcc +BuildRequires: mingw32-gcc mingw64-gcc %endif # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically @@ -79,7 +79,7 @@ Requires: syslinux-extlinux-nonlinux = %{version}-%{release} The EXTLINUX bootloader, for booting the local system, as well as all the SYSLINUX/PXELINUX modules in /boot. -%ifarch %{ix86} +%ifarch x86_64 %package tftpboot Summary: SYSLINUX modules in /tftpboot, available for network booting BuildArch: noarch @@ -215,7 +215,7 @@ rm -f %{buildroot}%{_includedir}/syslinux.h %{_mandir}/man1/extlinux* %config /etc/extlinux.conf -%ifarch %{ix86} +%ifarch x86_64 %files tftpboot /tftpboot @@ -262,6 +262,9 @@ fi %endif %changelog +* Tue Jul 23 2024 Yaakov Selkowitz - 6.04-0.29 +- Build tftpboot and nonlinux on x86_64 + * Thu Jul 11 2024 Michal Josef Špaček - 6.04-0.28 - Rewrite Digest::SHA1 to SHA