forked from pool/ocfs2-tools
Accepting request 115250 from home:dimstar:gcc47
Fix build against kernel 3.3... umode_t has vanished... OBS-URL: https://build.opensuse.org/request/show/115250 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=36
This commit is contained in:
parent
b422162fad
commit
adbb5de233
14
ocfs2-tools-kernel33.patch
Normal file
14
ocfs2-tools-kernel33.patch
Normal file
@ -0,0 +1,14 @@
|
||||
Index: ocfs2-tools/include/ocfs2-kernel/ocfs2_fs.h
|
||||
===================================================================
|
||||
--- ocfs2-tools.orig/include/ocfs2-kernel/ocfs2_fs.h
|
||||
+++ ocfs2-tools/include/ocfs2-kernel/ocfs2_fs.h
|
||||
@@ -316,6 +316,9 @@
|
||||
*/
|
||||
#define OCFS2_CLUSTER_O2CB_GLOBAL_HEARTBEAT (0x01)
|
||||
|
||||
+// Reintroduce umode_t, which disappeared in kernel 3.3
|
||||
+typedef unsigned short umode_t;
|
||||
+
|
||||
struct ocfs2_system_inode_info {
|
||||
char *si_name;
|
||||
int si_iflags;
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 24 20:04:54 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Add ocfs2-tools-kernel33.patch: Fix build with kernel 3.3, which
|
||||
dropped umode_t.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 21 14:13:46 UTC 2011 - coolo@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ocfs2-tools
|
||||
#
|
||||
# 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
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -49,11 +49,17 @@ Patch201: bug-543119-o2dlm.patch
|
||||
Patch202: fix-configure-check-libs.patch
|
||||
Patch203: fix-ocfs2_controld-crmcommon-link.patch
|
||||
Patch204: dont-use-var-lock-subsys.patch
|
||||
Patch205: ocfs2-tools-kernel33.patch
|
||||
Url: http://oss.oracle.com/projects/ocfs2-tools/
|
||||
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
|
||||
Requires: /sbin/chkconfig
|
||||
Requires: e2fsprogs
|
||||
Requires: glib2 >= 2.2.3
|
||||
Requires: modutils
|
||||
Requires: net-tools
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: libdlm openais
|
||||
Requires: libdlm
|
||||
Requires: openais
|
||||
%if %suse_version < 1120
|
||||
# There's no separate kmp for openSUSE 11.2
|
||||
Recommends: ocfs2-kmp
|
||||
@ -67,10 +73,15 @@ managing the file system.
|
||||
|
||||
%package -n ocfs2console
|
||||
Summary: Oracle Cluster Filesystem 2 GUI tools
|
||||
Group: System/Filesystems
|
||||
Obsoletes: ocfs2-support
|
||||
Requires: ocfs2-tools = %{version}
|
||||
AutoReqProv: No
|
||||
Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, python-gtk >= 1.99.16, ocfs2-tools = %{version}
|
||||
Requires: e2fsprogs
|
||||
Requires: glib2 >= 2.2.3
|
||||
Requires: ocfs2-tools = %{version}
|
||||
Requires: python-gtk >= 1.99.16
|
||||
Requires: vte >= 0.11.10
|
||||
|
||||
%description -n ocfs2console
|
||||
OCFS is the Oracle Cluster Filesystem.
|
||||
@ -79,7 +90,10 @@ This package contains additional tools and a GUI (python-gtk).
|
||||
|
||||
%package devel
|
||||
Summary: Oracle Cluster File System 2 Development files
|
||||
Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel
|
||||
Group: System/Filesystems
|
||||
Requires: libcom_err
|
||||
Requires: libcom_err-devel
|
||||
Requires: ocfs2-tools = %{version}
|
||||
|
||||
%description devel
|
||||
OCFS is the Oracle Cluster File System.
|
||||
@ -89,6 +103,7 @@ developing low-level OCFS2-aware applications.
|
||||
|
||||
%package o2cb
|
||||
Summary: Oracle Cluster File System 2 Core Tools
|
||||
Group: System/Filesystems
|
||||
Requires: ocfs2-tools = %{version}
|
||||
|
||||
%description o2cb
|
||||
@ -110,6 +125,7 @@ managing the file system.
|
||||
%patch202 -p1
|
||||
%patch203 -p1
|
||||
%patch204 -p1
|
||||
%patch205 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
|
||||
|
Loading…
Reference in New Issue
Block a user