Update to 6.04-pre1

Resolves: rhbz#1135793

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2016-05-04 15:47:18 -04:00
parent 4816caa628
commit 0b8c53cfc6
3 changed files with 13 additions and 18 deletions

View File

@ -8,11 +8,11 @@ Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE.
1 file changed, 10 insertions(+) 1 file changed, 10 insertions(+)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index fb387c5..3429058 100644 index b472945..6606d31 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -273,6 +273,16 @@ efi64: @@ -275,6 +275,16 @@ efi64:
FIRMWARE=EFI64 \ FIRMWARE=EFI64 FWCLASS=EFI \
$(MAKECMDGOALS) $(MAKECMDGOALS)
+install-all: +install-all:
@ -25,9 +25,8 @@ index fb387c5..3429058 100644
+ +
+all: +all:
+ +
else # ifeq($(HAVE_FIRMWARE),) else # FIRMWARE
all: all-local subdirs all: all-local subdirs
-- --
1.9.3 2.5.5

View File

@ -1 +1 @@
92a253df9211e9c20172796ecf388f13 syslinux-6.03.tar.xz f9c956fde0de29be297402ecbc8ff4d0 syslinux-6.04-pre1.tar.xz

View File

@ -1,21 +1,13 @@
Summary: Simple kernel loader which boots from a FAT filesystem Summary: Simple kernel loader which boots from a FAT filesystem
Name: syslinux Name: syslinux
Version: 6.03 Version: 6.04
%define tarball_version 6.03 %define tarball_version 6.04-pre1
Release: 7%{?dist} Release: 0.1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project 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 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 Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
# Backport from upstream git master to fix RHBZ #1234653
Patch0002: 0035-SYSAPPEND-Fix-space-stripping.patch
# From upstream ML, these should fix some GCC 5 issues, e.g. RHBZ #1263988
# http://www.syslinux.org/archives/2015-September/024317.html
# http://www.syslinux.org/archives/2015-September/024318.html
Patch0003: fix-alignment-change-gcc-5.patch
# http://www.syslinux.org/archives/2015-September/024319.html
Patch0004: dont-guess-section-alignment.patch
# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files # this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
# in noarch packages are a reason to stop the build. # in noarch packages are a reason to stop the build.
@ -265,6 +257,10 @@ elif [ -f /boot/extlinux.conf ]; then \
fi fi
%changelog %changelog
* Wed May 04 2016 Peter Jones <pjones@redhat.com> - - 6.04-0.1
- Update to 6.04-pre1
Resolves: rhbz#1135793
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.03-7 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.03-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild