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

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

Browse Source 
Reverting tarball to v1.8.2

OBS-URL: https://build.opensuse.org/request/show/160589
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=48
This commit is contained in:
Yan Gao 2013-03-22 13:31:56 +00:00 committed by Git OBS Bridge
parent 04b81d1308
commit 43faa20b89
6 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fix-pacemaker-libs.patch Normal file
View File

@ -0,0 +1,13 @@
Index: ocfs2-tools/ocfs2_controld/Makefile
===================================================================
--- ocfs2-tools.orig/ocfs2_controld/Makefile 2013-03-21 14:23:20.052598134 -0500
+++ ocfs2-tools/ocfs2_controld/Makefile 2013-03-21 14:37:56.089354059 -0500
@@ -67,7 +67,7 @@ DIST_FILES = \
ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS)
$(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \
$(OPENAIS_LIBS) $(COROSYNC_LIBS) \
- $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd
+ $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd -lcrmcommon
ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS)
$(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \

10
ocfs2-tools.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Mar 21 15:00:46 CDT 2013 - rgoldwyn@suse.com
- Reverted tarball to v1.8.2
- Added support-for-xvd-devices.patch: Support for xvd devices
- Fixed a couple of rpmlint errors
- libdlm requirement
- devel package grouping changed
- restore-g_list_append.patch is not required for old tarball
-------------------------------------------------------------------
Tue Mar 19 02:54:02 CDT 2013 - rgoldwyn@suse.com

7
ocfs2-tools.spec
View File

@ -56,7 +56,8 @@ Patch206: ocfs2-tools-resource.patch
Patch207: fix-indexed-dirs.patch
Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch
Patch209: 0002-Break-a-chain-loop-in-group-desc.patch
Patch210: restore-g_list_append.patch
Patch210: fix-pacemaker-libs.patch
Patch211: support-for-xvd-devices.patch
Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: /sbin/chkconfig
Requires: e2fsprogs
@ -65,7 +66,6 @@ Requires: modutils
Requires: net-tools
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libdlm
Requires: openais
%if %suse_version < 1120
# There's no separate kmp for openSUSE 11.2
@ -97,7 +97,7 @@ This package contains additional tools and a GUI (python-gtk).
%package devel
Summary: Oracle Cluster File System 2 Development files
Group: System/Filesystems
Group: Development/Libraries/C and C++
Requires: libcom_err
Requires: libcom_err-devel
Requires: ocfs2-tools = %{version}
@ -137,6 +137,7 @@ managing the file system.
%patch208 -p1
%patch209 -p1
%patch210 -p1
%patch211 -p1
%build
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
oid sha256:64f3d14752d1c3731255f2680cb980b2d3ac3b4e4ae7cc6e1558a21ee3f73cfe
size 1132271
oid sha256:590ec4905a486c59f1e2961c3c481d167357494da15042f1877967d16f2aa332
size 1131319

24
restore-g_list_append.patch
View File

@ -1,24 +0,0 @@
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() */

24
support-for-xvd-devices.patch Normal file
View File

@ -0,0 +1,24 @@
commit ff84eb5b6e76427f227632d5604703b8584d1b7f
Author: Srinivas Eeda <srinivas.eeda@oracle.com>
Date: Mon Feb 25 15:58:15 2013 -0800
ocfs2-tools: add support for xvd devices
It is common for virtual disks to be used with ocfs2 inside a VM. With Xen, these devices are /dev/xvd. This patch allows for xvd devices to be used when using global-heartbeat.
Signed-off-by: Wim Coekaerts <wim.coekaerts@oracle.com>
Acked-by: sunil.mushran@gmail.com
diff --git a/o2cb_ctl/o2cb_scandisk.c b/o2cb_ctl/o2cb_scandisk.c
index 92e754e..6cd3635 100644
--- a/o2cb_ctl/o2cb_scandisk.c
+++ b/o2cb_ctl/o2cb_scandisk.c
@@ -128,6 +128,8 @@ static void add_to_list(struct list_head *device_list, struct devnode *node)
add = !strncmp(path->path, "/dev/sd", 7);
if (!add)
add = !strncmp(path->path, "/dev/loop", 9);
+ if (!add)
+ add = !strncmp(path->path, "/dev/xvd", 8);
}
if (add) {
hb = malloc(sizeof(struct hb_devices));