[syslinux] Update this to 6.02
Peter Jones
pjones at fedoraproject.org
Tue Apr 8 20:37:47 UTC 2014
commit f03ed5078a1adc0f0b3befd7d219891a88eba9a8
Author: Peter Jones <pjones at redhat.com>
Date: Tue Apr 8 16:37:03 2014 -0400
Update this to 6.02
.gitignore | 3 +-
...l-all-target-to-top-side-of-HAVE_FIRMWARE.patch | 33 +
0002-Don-t-build-efi32.patch | 40 +
sources | 2 +-
syslinux-4.05-avoid-ext2_fs.h.patch | 965 --------------------
syslinux-isohybrid-fix-mbr.patch | 124 ---
syslinux.spec | 60 +-
7 files changed, 115 insertions(+), 1112 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd57318..32d4f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
clog
-syslinux-4.02.tar.bz2
-/syslinux-4.05.tar.bz2
+syslinux-*.tar.*
diff --git a/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch b/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
new file mode 100644
index 0000000..255d0df
--- /dev/null
+++ b/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
@@ -0,0 +1,33 @@
+From 8b8b0ab5cae3e3e47104dfe696d06709f8ce6850 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 8 Apr 2014 15:28:12 -0400
+Subject: [PATCH 1/2] Add "install-all target" to top side of HAVE_FIRMWARE.
+
+---
+ Makefile | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index cceb66e..b8ee459 100644
+--- a/Makefile
++++ b/Makefile
+@@ -269,6 +269,16 @@ efi64:
+ ARCH=x86_64 BITS=64 EFI_BUILD=1 LDLINUX=ldlinux.e64 \
+ $(MAKECMDGOALS)
+
++install-all:
++
++install:
++
++netinstall:
++
++clean:
++
++all:
++
+ else # ifeq($(HAVE_FIRMWARE),)
+
+ all: all-local subdirs
+--
+1.9.0
+
diff --git a/0002-Don-t-build-efi32.patch b/0002-Don-t-build-efi32.patch
new file mode 100644
index 0000000..64b7e57
--- /dev/null
+++ b/0002-Don-t-build-efi32.patch
@@ -0,0 +1,40 @@
+From 8a339e31bdfbaa188a113f690501fea201f71f87 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 8 Apr 2014 15:15:48 -0400
+Subject: [PATCH 2/2] Don't build efi32.
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b8ee459..5ce63c8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -84,7 +84,7 @@ endif
+ # creating. Which means that we always need a *real* target, such as
+ # 'all', appended to the make goals.
+ #
+-firmware = bios efi32 efi64
++firmware = bios efi64
+ real-target := $(filter-out $(firmware), $(MAKECMDGOALS))
+ real-firmware := $(filter $(firmware), $(MAKECMDGOALS))
+
+@@ -222,12 +222,12 @@ endif # ifdef EFI_BUILD
+
+ ifeq ($(HAVE_FIRMWARE),)
+
+-firmware = bios efi32 efi64
++firmware = bios efi64
+
+ # If no firmware was specified the rest of MAKECMDGOALS applies to all
+ # firmware.
+ ifeq ($(filter $(firmware),$(MAKECMDGOALS)),)
+-all strip tidy clean dist spotless install installer netinstall: bios efi32 efi64
++all strip tidy clean dist spotless install installer netinstall: bios efi64
+
+ else
+
+--
+1.9.0
+
diff --git a/sources b/sources
index 100561f..3292762 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82299242418385da1274c9479a778cb2 syslinux-4.05.tar.bz2
+6f275813a1b08cf852e55c0a3f8fbc78 syslinux-6.02.tar.xz
diff --git a/syslinux.spec b/syslinux.spec
index 8712cfa..2cfdf54 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -1,15 +1,18 @@
Summary: Simple kernel loader which boots from a FAT filesystem
Name: syslinux
-Version: 4.05
-%define tarball_version 4.05
-Release: 7%{?dist}
+Version: 6.02
+%define tarball_version 6.02
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
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.bz2
+Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
+Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
+Patch0002: 0002-Don-t-build-efi32.patch
+
ExclusiveArch: %{ix86} x86_64
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs
+BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs, git
BuildRequires: /usr/include/gnu/stubs-32.h
BuildRequires: libuuid-devel
%ifarch %{ix86}
@@ -19,9 +22,6 @@ Requires: mtools, libc.so.6
Requires: mtools, libc.so.6()(64bit)
%endif
-Patch1: syslinux-isohybrid-fix-mbr.patch
-Patch2: syslinux-4.05-avoid-ext2_fs.h.patch
-
# NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
# a system bootloader, and may be necessary for system recovery.
%define _sbindir /sbin
@@ -64,19 +64,25 @@ Requires: syslinux
All the SYSLINUX/PXELINUX modules directly available for network
booting in the /tftpboot directory.
+%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
+
%prep
%setup -q -n syslinux-%{tarball_version}
-
-%patch1 -p1 -b .isohyb
-%patch2 -p1 -b .ext2
+git init
+git config user.email "%{name}-owner at fedoraproject.org"
+git config user.name "Fedora Ninjas"
+git add .
+git commit -a -q -m "%{version} baseline."
+git am %{patches} </dev/null
%build
-CFLAGS="-Werror -Wno-unused -finline-limit=2000"
-export CFLAGS
-# If you make clean here, we lose the provided syslinux.exe
-#make clean
-make installer
-make -C sample tidy
+make bios clean all
+make efi64 clean all
%install
rm -rf %{buildroot}
@@ -85,11 +91,18 @@ mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_prefix}/lib/syslinux
mkdir -p %{buildroot}%{_includedir}
-make install-all \
+make bios install-all \
+ INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
+ LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
+ MANDIR=%{_mandir} INCDIR=%{_includedir} \
+ TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
+ LDLINUX=ldlinux.c32
+make efi64 install netinstall \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
- LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
+ LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
MANDIR=%{_mandir} INCDIR=%{_includedir} \
- TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux
+ TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux \
+ LDLINUX=ldlinux.c32
mkdir -p %{buildroot}/%{_docdir}/%{name}/sample
install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}/sample/
@@ -154,6 +167,10 @@ rm -rf %{buildroot}
%files tftpboot
/tftpboot
+%files efi64
+%dir %{_datadir}/syslinux/efi64
+%{_datadir}/syslinux/efi64
+
%post extlinux
# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader
# and update it.
@@ -166,6 +183,9 @@ elif [ -f /boot/extlinux.conf ]; then \
fi
%changelog
+* Tue Apr 08 2014 Peter Jones <pjones at redhat.com> - 6.02-1
+- Update this to 6.02
+
* Mon Aug 05 2013 Peter Jones <pjones at redhat.com> - 4.05-7
- Fixing %%doc path.
More information about the scm-commits
mailing list