rpms/syslinux
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Undo packaging changes that break live image composes (#1086446)"

Browse Source 
This is the completely wrong way to fix this problem.  It's particularly
bad because kkofler identified what was going wrong, and chose to ignore it
in favor of this bad packaging change.

Fix the inability to resolve cross-arch requires on livecd spins.  That's
the right answer here. Having two different i686 builds of syslinux, one
inside x86_64 packaging, is not in any way acceptable.

This reverts commit 1bf8f6f5bf.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2014-04-15 10:03:26 -04:00
parent 1bf8f6f5bf
commit 7c0a8c7775
1 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
syslinux.spec
View File

@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
Name: syslinux
Version: 6.02
%define tarball_version 6.02
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
@ -15,8 +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
Obsoletes: %{name}-nonlinux < %{version}-%{release}
Provides: %{name}-nonlinux = %{version}-%{release}
Requires: syslinux-nonlinux = %{version}-%{release}
%ifarch %{ix86}
Requires: mtools, libc.so.6
BuildRequires: mingw32-gcc
@ -54,8 +53,7 @@ Headers and libraries for syslinux development.
Summary: The EXTLINUX bootloader, for booting the local system.
Group: System/Boot
Requires: syslinux
Obsoletes: %{name}-extlinux-nonlinux < %{version}-%{release}
Provides: %{name}-extlinux-nonlinux = %{version}-%{release}
Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
%description extlinux
The EXTLINUX bootloader, for booting the local system, as well as all
@ -66,14 +64,34 @@ Summary: SYSLINUX modules in /tftpboot, available for network booting
Group: Applications/Internet
Requires: syslinux
%ifarch x86_64
# self-obsoletes to get rid of i686 multilib
Obsoletes: %{name}-tftpboot = 6.02-1.fc21
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
@ -148,12 +166,6 @@ rm -rf %{buildroot}
%dir %{_datadir}/syslinux/dosutil
%{_datadir}/syslinux/dosutil/*
%{_datadir}/syslinux/diag/*
%{_datadir}/syslinux/*.com
%{_datadir}/syslinux/*.exe
%{_datadir}/syslinux/*.c32
%{_datadir}/syslinux/*.bin
%{_datadir}/syslinux/*.0
%{_datadir}/syslinux/memdisk
%ifarch %{ix86}
%{_datadir}/syslinux/syslinux.exe
%else
@ -183,11 +195,33 @@ rm -rf %{buildroot}
%files extlinux
%{_sbindir}/extlinux
%config /etc/extlinux.conf
/boot/extlinux
%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
@ -206,6 +240,9 @@ elif [ -f /boot/extlinux.conf ]; then \
fi
%changelog
* Tue Apr 15 2014 Peter Jones <pjones@redhat.com> - 6.02-3
- -2 was entirely the wrong thing to do.
* Tue Apr 15 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6.02-2
- Undo packaging changes that break live image composes (#1086446)