pool/ocfs2-tools
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 159672 from home:goldwynr:branches:network:ha-clustering:Factory

Browse Source 
Updated ocfs2-tools tarball and fixed o2cb

OBS-URL: https://build.opensuse.org/request/show/159672
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=46
This commit is contained in:
Yan Gao 2013-03-19 01:32:27 +00:00 committed by Git OBS Bridge
parent 06dbc23e86
commit ccbf926dc7
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ocfs2-tools.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ocfs2-tools # spec file for package ocfs2-tools
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 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
@ -55,6 +55,7 @@ Patch206: ocfs2-tools-resource.patch
Patch207: fix-indexed-dirs.patch Patch207: fix-indexed-dirs.patch
Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch
Patch209: 0002-Break-a-chain-loop-in-group-desc.patch Patch209: 0002-Break-a-chain-loop-in-group-desc.patch
Patch210: restore-g_list_append.patch
Url: http://oss.oracle.com/projects/ocfs2-tools/ Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: /sbin/chkconfig Requires: /sbin/chkconfig
Requires: e2fsprogs Requires: e2fsprogs
@ -134,6 +135,7 @@ managing the file system.
%patch207 -p1 %patch207 -p1
%patch208 -p1 %patch208 -p1
%patch209 -p1 %patch209 -p1
%patch210 -p1
%build %build
export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"

4
ocfs2-tools.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a66c14aa2e505099784dd5f2378a6a817265dd7fb637f853abb682d60a7b5cb7 oid sha256:64f3d14752d1c3731255f2680cb980b2d3ac3b4e4ae7cc6e1558a21ee3f73cfe
size 1125613 size 1132271

24
restore-g_list_append.patch Normal file
View File

@ -0,0 +1,24 @@
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH] Fix list_append in jconfig.c
Patch deb5ade9145f8809f1fde19cf53bdfdf1fb7963e was over-zealous in
removing warnings and g_list_append() got deleted.
Restore g_list_append() to fix the issue.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
diff --git a/o2cb_ctl/jconfig.c b/o2cb_ctl/jconfig.c
index bad34ba..79bbddb 100644
--- a/o2cb_ctl/jconfig.c
+++ b/o2cb_ctl/jconfig.c
@@ -1082,6 +1082,8 @@ JConfigStanza *j_config_add_stanza(JConfig *cf,
g_strdup(stanza_name),
elem);
}
+ else
+ g_list_append(elem, cfs);
return(cfs);
} /* j_config_add_stanza() */