- fix build with latest kernel headers

OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=38
This commit is contained in:
Steffen Winterfeldt 2012-05-08 09:22:42 +00:00 committed by Git OBS Bridge
parent 642a17fa6c
commit 01cecd9ef0
3 changed files with 26 additions and 7 deletions

10
syslinux-4.04-umode.diff Normal file
View File

@ -0,0 +1,10 @@
--- libinstaller/linuxioctl.h 2011-04-18 23:24:17.000000000 +0200
+++ libinstaller/linuxioctl.h 2012-05-08 11:20:12.864813538 +0200
@@ -19,6 +19,7 @@
#undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */
#undef SECTOR_BITS
+typedef unsigned short umode_t; /* moved into __KERNEL__ */
#include <linux/ext2_fs.h> /* EXT2_IOC_* */
#ifndef FAT_IOCTL_GET_ATTRIBUTES

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 8 11:22:14 CEST 2012 - snwint@suse.de
- fix build with latest kernel headers
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 26 11:46:59 CEST 2011 - snwint@suse.de Tue Jul 26 11:46:59 CEST 2011 - snwint@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package syslinux # spec file for package syslinux
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,18 +16,20 @@
# #
Name: syslinux Name: syslinux
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
BuildRequires: libpng-devel nasm netpbm python xz BuildRequires: libpng-devel
BuildRequires: nasm
BuildRequires: netpbm
BuildRequires: python
BuildRequires: xz
Url: http://syslinux.zytor.com/ Url: http://syslinux.zytor.com/
License: GPLv2+
Group: System/Boot
Requires: mtools Requires: mtools
AutoReqProv: on
Summary: Boot Loader for Linux Summary: Boot Loader for Linux
License: GPL-2.0+
Group: System/Boot
Version: 4.04 Version: 4.04
Release: 8 Release: 0
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: isolinux-config Source1: isolinux-config
Source2: README.gfxboot Source2: README.gfxboot
@ -37,6 +39,7 @@ Patch2: %{name}-%{version}-noinitrd.diff
Patch3: %{name}-%{version}-mboot_bootif.diff Patch3: %{name}-%{version}-mboot_bootif.diff
Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff
Patch5: %{name}-%{version}-md5pass.diff Patch5: %{name}-%{version}-md5pass.diff
Patch6: %{name}-%{version}-umode.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -59,6 +62,7 @@ Authors:
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p0
%build %build
cp %{SOURCE2} . cp %{SOURCE2} .