diff --git a/0003-include-sysmacros-h.patch b/0003-include-sysmacros-h.patch new file mode 100644 index 0000000..a39019e --- /dev/null +++ b/0003-include-sysmacros-h.patch @@ -0,0 +1,33 @@ +From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 19 Apr 2016 06:50:31 -0400 +Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev + +These functions are defined in sys/sysmacros.h, so add the include to +main.c. This is already handled correctly in mountinfo.c. Otherwise +we get build failures like: + +main.o: In function 'find_device_sysfs': +extlinux/main.c:1131: undefined reference to 'minor' + +Signed-off-by: Mike Frysinger +Signed-off-by: Gene Cumm +--- + extlinux/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extlinux/main.c b/extlinux/main.c +index a7ebd49..ebff7ea 100644 +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.10.5.GIT + diff --git a/syslinux.spec b/syslinux.spec index dc745b6..e82f657 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -2,12 +2,13 @@ Summary: Simple kernel loader which boots from a FAT filesystem Name: syslinux Version: 6.04 %define tarball_version 6.04-pre1 -Release: 0.10%{?dist} +Release: 0.11%{?dist} License: GPLv2+ 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 Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch Patch0002: 0002-ext4-64bit-feature.patch +Patch0003: 0003-include-sysmacros-h.patch # this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files # in noarch packages are a reason to stop the build. @@ -245,6 +246,9 @@ elif [ -f /boot/extlinux.conf ]; then \ fi %changelog +* Fri May 10 2019 Scott Talbert - 6.04-0.11 +- Add upstream patch to include sysmacros.h to fix FTBFS (#1676107) + * Sun Feb 03 2019 Fedora Release Engineering - 6.04-0.10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild