ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 37897 from network:ha-clustering:Factory

Browse Source 
checked in (request 37897)

OBS-URL: https://build.opensuse.org/request/show/37897
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=6
This commit is contained in:
OBS User autobuild 2010-04-15 23:10:07 +00:00 committed by Git OBS Bridge
parent ccf3a393c7
commit f77e13198f
4 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ocfs2-mount-gcc45.patch
View File

@ -1,21 +0,0 @@
Index: mount.ocfs2/mount.ocfs2.c
===================================================================
--- mount.ocfs2/mount.ocfs2.c.orig
+++ mount.ocfs2/mount.ocfs2.c
@@ -261,7 +261,7 @@ int main(int argc, char **argv)
char *extra = NULL;
int dev_ro = 0;
char *hbstr = NULL;
- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = "";
+ char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1];
ocfs2_filesys *fs = NULL;
struct o2cb_cluster_desc cluster;
struct o2cb_region_desc desc;
@@ -269,6 +269,7 @@ int main(int argc, char **argv)
int hb_started = 0;
struct stat statbuf;
+ stackstr[0] = '\0';
initialize_ocfs_error_table();
initialize_o2dl_error_table();
initialize_o2cb_error_table();

12
ocfs2-tools-dynamic-com-err.patch
View File

@ -1,12 +0,0 @@
Index: o2image/Makefile
===================================================================
--- o2image/Makefile.orig
+++ o2image/Makefile
@@ -32,6 +32,6 @@ OBJS = $(subst .c,.o,$(CFILES))
DIST_FILES = $(CFILES) $(HFILES) o2image.8.in
o2image: $(OBJS) $(LIBOCFS2_DEPS)
- $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lpthread
+ $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) -Wl,-Bdynamic $(COM_ERR_LIBS) -lpthread
include $(TOPDIR)/Postamble.make

5
ocfs2-tools.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Fri Apr 9 07:25:41 UTC 2010 - aj@suse.de
- Fix build.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 30 08:03:29 UTC 2009 - aj@suse.de Wed Sep 30 08:03:29 UTC 2009 - aj@suse.de

6
ocfs2-tools.spec
View File

@ -19,7 +19,7 @@
Name: ocfs2-tools Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel libcom_err-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files BuildRequires: e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools Summary: Oracle Cluster File System 2 Core Tools
Version: 1.4.1 Version: 1.4.1
Release: 24 Release: 24
@ -38,8 +38,6 @@ Patch103: ocfs2console-extraoption-fix.diff
Patch104: ocfs2console-pop-display-warning.diff Patch104: ocfs2console-pop-display-warning.diff
Patch105: ocfs2_controld-retry-470741.diff Patch105: ocfs2_controld-retry-470741.diff
Patch106: tunefs.ocfs2.8.in_more_options.diff Patch106: tunefs.ocfs2.8.in_more_options.diff
Patch107: ocfs2-mount-gcc45.patch
Patch108: ocfs2-tools-dynamic-com-err.patch
Url: http://oss.oracle.com/projects/ocfs2-tools/ Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
@ -132,8 +130,6 @@ Authors:
%patch104 -p1 %patch104 -p1
%patch105 -p1 %patch105 -p1
%patch106 -p1 %patch106 -p1
%patch107 -p0
%patch108 -p0
%build %build
# disable as-needed to fix configure checks # disable as-needed to fix configure checks