Accepting request 220526 from network:ha-clustering:Factory

Updated changelog (forwarded request 220525 from goldwynr)

OBS-URL: https://build.opensuse.org/request/show/220526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=55
This commit is contained in:
Stephan Kulow 2014-02-01 08:40:17 +00:00 committed by Git OBS Bridge
commit 2eb3a802fa
2 changed files with 10 additions and 3 deletions

View File

@ -1,8 +1,9 @@
From 1110d13d756406a6188299bf68db4743cf7c41a3 Mon Sep 17 00:00:00 2001
From 6423caf73ef9d0f22acf294e100523bc2af3acc9 Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Date: Sat, 21 Dec 2013 18:41:04 -0600
Subject: [PATCH] Use cmap for getting cluster name
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
debugfs.ocfs2/Makefile | 2 +-
libo2cb/o2cb_abi.c | 79 +++++++++++++++++++++++++++-----------------------
@ -24,7 +25,7 @@ index ca4c9a4..30dfa5f 100644
MANS = debugfs.ocfs2.8
diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c
index ae03595..40f8176 100644
index ae03595..6c3ad73 100644
--- a/libo2cb/o2cb_abi.c
+++ b/libo2cb/o2cb_abi.c
@@ -35,6 +35,8 @@
@ -69,7 +70,7 @@ index ae03595..40f8176 100644
- break;
- }
+
+ lib_handle = dlopen("libcmap.so", RTLD_NOW | RTLD_LOCAL);
+ lib_handle = dlopen("libcmap.so.4", RTLD_NOW | RTLD_LOCAL);
+ if (!lib_handle)
+ return ret;
+

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 31 22:21:11 UTC 2014 - rgoldwyn@suse.com
- Use libcmap.so.4 for dlopen in 0001-Use-cmap-for-getting-cluster-name.patch
to remove dependency on devel package (bnc#860982)
-------------------------------------------------------------------
Fri Dec 27 17:56:21 UTC 2013 - rgoldwyn@suse.com