Make i686 builds work maybe.

I tried testing this, but mock got nothing buyt 404s from our repos.

Our repos are pretty great.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2014-04-08 17:24:34 -04:00
parent f03ed5078a
commit cf3072fad9

View File

@ -15,6 +15,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs, git
BuildRequires: /usr/include/gnu/stubs-32.h
BuildRequires: libuuid-devel
Requires: syslinux-nonlinux = %{version}-%{release}
%ifarch %{ix86}
Requires: mtools, libc.so.6
%endif
@ -50,6 +51,7 @@ Headers and libraries for syslinux development.
Summary: The EXTLINUX bootloader, for booting the local system.
Group: System/Boot
Requires: syslinux
Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
%description extlinux
The EXTLINUX bootloader, for booting the local system, as well as all
@ -59,17 +61,43 @@ the SYSLINUX/PXELINUX modules in /boot.
Summary: SYSLINUX modules in /tftpboot, available for network booting
Group: Applications/Internet
Requires: syslinux
%ifarch x86_64
Requires: syslinux-tftpboot(x86-32) = %{version}-%{release}
%endif
%description tftpboot
All the SYSLINUX/PXELINUX modules directly available for network
booting in the /tftpboot directory.
%ifarch %{ix86}
%package extlinux-nonlinux
Summary: The parts of the EXTLINUX bootloader which aren't run from linux.
Group: System/Boot
Requires: syslinux
%description extlinux-nonlinux
All the EXTLINUX binaries that run from the firmware rather than
from a linux host.
%package nonlinux
Summary: SYSLINUX modules which aren't run from linux.
Group: System/Boot
Requires: syslinux
%description nonlinux
All the SYSLINUX binaries that run from the firmware rather than from a
linux host. It also includes a tool, MEMDISK, which loads legacy operating
systems from media.
%endif
%ifarch %{x86_64}
%package efi64
Summary: SYSLINUX binaries and modules for 64-bit UEFI systems
Group: System/Boot
%description efi64
SYSLINUX binaries and modules for 64-bit UEFI systems
%endif
%prep
%setup -q -n syslinux-%{tarball_version}
@ -82,7 +110,9 @@ git am %{patches} </dev/null
%build
make bios clean all
%ifarch %{x86_64}
make efi64 clean all
%endif
%install
rm -rf %{buildroot}
@ -97,12 +127,14 @@ make bios install-all \
MANDIR=%{_mandir} INCDIR=%{_includedir} \
TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
LDLINUX=ldlinux.c32
%ifarch %{x86_64}
make efi64 install netinstall \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
MANDIR=%{_mandir} INCDIR=%{_includedir} \
TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
LDLINUX=ldlinux.c32
%endif
mkdir -p %{buildroot}/%{_docdir}/%{name}/sample
install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}/sample/
@ -129,12 +161,6 @@ rm -rf %{buildroot}
%{_bindir}/memdiskfind
%{_bindir}/syslinux
%dir %{_datadir}/syslinux
%{_datadir}/syslinux/*.com
%{_datadir}/syslinux/*.exe
%{_datadir}/syslinux/*.c32
%{_datadir}/syslinux/*.bin
%{_datadir}/syslinux/*.0
%{_datadir}/syslinux/memdisk
%dir %{_datadir}/syslinux/dosutil
%{_datadir}/syslinux/dosutil/*
%{_datadir}/syslinux/diag/*
@ -161,15 +187,39 @@ rm -rf %{buildroot}
%files extlinux
%{_sbindir}/extlinux
/boot/extlinux
%config /etc/extlinux.conf
%files tftpboot
%ifarch %{ix86}
/tftpboot
%files nonlinux
%{_datadir}/syslinux/*.com
%{_datadir}/syslinux/*.exe
%{_datadir}/syslinux/*.c32
%{_datadir}/syslinux/*.bin
%{_datadir}/syslinux/*.0
%{_datadir}/syslinux/memdisk
%files extlinux-nonlinux
/boot/extlinux
%else
%exclude %{_datadir}/syslinux/memdisk
%exclude %{_datadir}/syslinux/*.com
%exclude %{_datadir}/syslinux/*.exe
%exclude %{_datadir}/syslinux/*.c32
%exclude %{_datadir}/syslinux/*.bin
%exclude %{_datadir}/syslinux/*.0
%exclude /boot/extlinux
%exclude /tftpboot
%endif
%ifarch %{x86_64}
%files efi64
%dir %{_datadir}/syslinux/efi64
%{_datadir}/syslinux/efi64
%endif
%post extlinux
# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader