[syslinux/f17] Fix missing types include to fix the build

Matthew Garrett mjg59 at fedoraproject.org
Wed Feb 15 18:32:50 UTC 2012


commit 3b5ca3f252f650a54ced0109cd1f6645910a1cfb
Author: Matthew Garrett <mjg at redhat.com>
Date:   Wed Feb 15 12:31:06 2012 -0500

    Fix missing types include to fix the build

 syslinux-4.05-fix-types.patch |   10 ++++++++++
 syslinux.spec                 |    3 +++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/syslinux-4.05-fix-types.patch b/syslinux-4.05-fix-types.patch
new file mode 100644
index 0000000..5b756a6
--- /dev/null
+++ b/syslinux-4.05-fix-types.patch
@@ -0,0 +1,10 @@
+--- syslinux-4.05.prep/libinstaller/linuxioctl.h	2011-12-09 13:28:17.000000000 -0500
++++ syslinux-4.05/libinstaller/linuxioctl.h	2012-02-15 12:28:13.393212119 -0500
+@@ -7,6 +7,7 @@
+ #ifndef LIBINSTALLER_LINUXIOCTL_H
+ #define LIBINSTALLER_LINUXIOCTL_H
+ 
++typedef unsigned short umode_t;
+ #include <sys/ioctl.h>
+ 
+ #define statfs _kernel_statfs	/* HACK to deal with broken 2.4 distros */
diff --git a/syslinux.spec b/syslinux.spec
index 134efe1..3d4336a 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -22,6 +22,7 @@ Obsoletes: syslinux-devel < %{version}-%{release}
 Provides: syslinux-devel
 
 Patch1: syslinux-isohybrid-fix-mbr.patch
+Patch2: syslinux-4.05-fix-types.patch
 
 # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
 # a system bootloader, and may be necessary for system recovery.
@@ -69,6 +70,7 @@ booting in the /tftpboot directory.
 %setup -q -n syslinux-%{tarball_version}
 
 %patch1 -p1 -b .isohyb
+%patch2 -p1 -b .types
 
 %build
 CFLAGS="-Werror -Wno-unused -finline-limit=2000"
@@ -169,6 +171,7 @@ fi
 * Wed Feb 15 2012 Matthew Garrett <mjg at redhat.com> - 4.05-1
 - New upstream release
 - syslinux-isohybrid-fix-mbr.patch: generate a full MBR for UEFI images
+- syslinux-4.05-fix-types.patch: Fix build failure with new kernel headers
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.02-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list