Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at 2013-10-09 09:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old) and /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2013-09-25 17:18:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 2013-10-09 09:44:55.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 1 15:07:57 UTC 2013 - [email protected] + +- mkfs.ocfs2: Setup cluster_stack if not setup + + 0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch +- Remove patch numbers for easier future maintainability. + +------------------------------------------------------------------- @@ -10 +17 @@ - +bug-838705-change_dlm_lib.patch + + 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch Old: ---- bug-838705-change_dlm_lib.patch New: ---- 0007-Use-libdlm_lt.so.3-instead-of-libdlm_lt.so.patch 0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -55,7 +55,8 @@ Patch227: 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch Patch228: 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch Patch229: 0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch -Patch230: bug-838705-change_dlm_lib.patch +Patch230: 0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch +Patch231: 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch BuildRequires: autoconf BuildRequires: e2fsprogs-devel @@ -176,6 +177,7 @@ %patch228 -p1 %patch229 -p1 %patch230 -p1 +%patch231 -p1 %build export PROJECT="ocfs2-tools" ++++++ 0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 2d1b78517ff14633f4b1cf4adddf6308721f9722 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 19 Aug 2013 08:20:32 -0500 -Subject: [PATCH 1/7] libo2cb: Remove controld actions from group join/leave +Subject: [PATCH] libo2cb: Remove controld actions from group join/leave --- libo2cb/o2cb_abi.c | 152 +---------------------------------------------------- ++++++ 0002-libo2cb-Remove-rest-of-controld-functions.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 40b1211091b62a4884d1625fc04d476a07489ca3 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 19 Aug 2013 08:38:59 -0500 -Subject: [PATCH 2/7] libo2cb: Remove rest of controld functions +Subject: [PATCH] libo2cb: Remove rest of controld functions --- libo2cb/o2cb_abi.c | 388 +---------------------------------------------------- @@ -9,8 +9,8 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c =================================================================== ---- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/libo2cb/o2cb_abi.c 2013-08-23 22:50:22.129878132 -0500 -+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c 2013-08-23 22:52:20.143277130 -0500 +--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/libo2cb/o2cb_abi.c 2013-10-01 11:36:42.953751354 -0500 ++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c 2013-10-01 11:39:04.935088610 -0500 @@ -46,7 +46,6 @@ #define CLUSTER_STACK_FILE "/sys/fs/ocfs2/cluster_stack" #define LOCKING_PROTOCOL_FILE "/sys/fs/ocfs2/max_locking_protocol" ++++++ 0003-Get-cluster-name-from-corosync-cmap.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 3f2b73105c5e09e17744ec249eed93c60124bd2d Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 19 Aug 2013 18:05:04 -0500 -Subject: [PATCH 3/7] Get cluster name from corosync cmap +Subject: [PATCH] Get cluster name from corosync cmap --- libo2cb/o2cb_abi.c | 20 ++++++++++++++++++++ ++++++ 0004-Remove-controld-structures-from-debugfs.ocfs2.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 394a3e7d2758331ba8aa6fc38957611d2447a73d Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 19 Aug 2013 19:15:53 -0500 -Subject: [PATCH 4/7] Remove controld structures from debugfs.ocfs2 +Subject: [PATCH] Remove controld structures from debugfs.ocfs2 --- debugfs.ocfs2/commands.c | 34 ---------------------------------- ++++++ 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 8563d603b7af2a32ef1e19337eaeb9d7cace730c Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 19 Aug 2013 19:18:40 -0500 -Subject: [PATCH 5/7] Check for DLM kernel version in user_begin_group_join +Subject: [PATCH] Check for DLM kernel version in user_begin_group_join Since we just have to check if the DLM daemon is running, we just check the kernel version running. Checking the kernel version ++++++ 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 4adc4d242f3f69808e7e2bed71337ff7e7966846 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 19 Aug 2013 19:20:19 -0500 -Subject: [PATCH 6/7] Add cmap and dlm libraries in the tools +Subject: [PATCH] Add cmap and dlm libraries in the tools --- fsck.ocfs2/Makefile | 2 +- ++++++ 0007-Use-libdlm_lt.so.3-instead-of-libdlm_lt.so.patch ++++++ >From a1f08ff644b53da04f5cd450476ae3db6bc14583 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Mon, 2 Sep 2013 11:15:31 -0500 Subject: [PATCH] Use libdlm_lt.so.3 instead of libdlm_lt.so --- libo2dlm/o2dlm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libo2dlm/o2dlm.c b/libo2dlm/o2dlm.c index dbc642b..9899694 100644 --- a/libo2dlm/o2dlm.c +++ b/libo2dlm/o2dlm.c @@ -802,7 +802,7 @@ static errcode_t load_fsdlm(struct o2dlm_ctxt *ctxt) goto out; } - ctxt->ct_lib_handle = dlopen("libdlm_lt.so", + ctxt->ct_lib_handle = dlopen("libdlm_lt.so.3", RTLD_NOW | RTLD_LOCAL); if (!ctxt->ct_lib_handle) goto out; -- 1.8.1.4 ++++++ 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,8 +1,8 @@ From 5d0bffdbbadd38173a9bfbf4ffb8d455b5f0b990 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Tue, 3 Sep 2013 07:40:39 -0500 -Subject: [PATCH 8/8] mount.ocfs2: Read stack from device and setup stack if - not present +Subject: [PATCH] mount.ocfs2: Read stack from device and setup stack if not + present Note, this removes cman as the possible user stack. --- ++++++ 0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch ++++++ --- /var/tmp/diff_new_pack.LA2ECi/_old 2013-10-09 09:44:56.000000000 +0200 +++ /var/tmp/diff_new_pack.LA2ECi/_new 2013-10-09 09:44:56.000000000 +0200 @@ -1,7 +1,7 @@ From 14c5f3788b047024390c1a1ae40a0585417ed0d9 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Wed, 4 Sep 2013 23:56:39 -0500 -Subject: [PATCH 9/9] mkfs.ocfs2: Abort if cluster information is not detected +Subject: [PATCH] mkfs.ocfs2: Abort if cluster information is not detected --- mkfs.ocfs2/check.c | 19 +++++++++++++++---- ++++++ 0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch ++++++ >From 007b8d8d784a4108d5bde3cf1d0f1289a73957fd Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues <[email protected]> Date: Tue, 1 Oct 2013 09:39:17 -0500 Subject: [PATCH] mkfs: Setup cluster_stack if not setup based on what is set --- mkfs.ocfs2/check.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mkfs.ocfs2/check.c b/mkfs.ocfs2/check.c index 75f0e7b..865dcc3 100644 --- a/mkfs.ocfs2/check.c +++ b/mkfs.ocfs2/check.c @@ -350,6 +350,15 @@ int ocfs2_check_volume(State *s) goto nolock; if (!s->force) { + if (s->cluster_stack) { + ret = o2cb_setup_stack(s->cluster_stack); + if (ret) { + com_err(s->progname, ret, + "while setting up stack\n"); + return -1; + } + } + ret = o2cb_init(); if (ret) { com_err(s->progname, ret, -- 1.8.1.4 ++++++ 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch ++++++ >From 86a0abd01111e80803218cdae3348d2563fa2c1b Mon Sep 17 00:00:00 2001 From: Lidong Zhong <[email protected]> Date: Tue, 1 Oct 2013 09:48:27 -0500 Subject: [PATCH] Use dlm_lt instead of dlm for DLM libraries References: bnc#838705 Signed-off-by: Lidong Zhong <[email protected]> --- fsck.ocfs2/Makefile | 2 +- mkfs.ocfs2/Makefile | 2 +- mount.ocfs2/Makefile | 2 +- mounted.ocfs2/Makefile | 2 +- ocfs2_hb_ctl/Makefile | 2 +- tunefs.ocfs2/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile index d1c71f8..e3032fa 100644 --- a/fsck.ocfs2/Makefile +++ b/fsck.ocfs2/Makefile @@ -12,7 +12,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a -LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm +LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm_lt LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal LIBTOOLS_INTERNAL_DEPS = $(TOPDIR)/libtools-internal/libtools-internal.a diff --git a/mkfs.ocfs2/Makefile b/mkfs.ocfs2/Makefile index 1fed073..6840102 100644 --- a/mkfs.ocfs2/Makefile +++ b/mkfs.ocfs2/Makefile @@ -8,7 +8,7 @@ SBIN_PROGRAMS = mkfs.ocfs2 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a -LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm +LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm_lt LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) diff --git a/mount.ocfs2/Makefile b/mount.ocfs2/Makefile index 2736f5f..e42958e 100644 --- a/mount.ocfs2/Makefile +++ b/mount.ocfs2/Makefile @@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a -LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap +LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a DEFINES = -DVERSION=\"$(VERSION)\" diff --git a/mounted.ocfs2/Makefile b/mounted.ocfs2/Makefile index 3e18895..577216e 100644 --- a/mounted.ocfs2/Makefile +++ b/mounted.ocfs2/Makefile @@ -8,7 +8,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a -LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap +LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal diff --git a/ocfs2_hb_ctl/Makefile b/ocfs2_hb_ctl/Makefile index d04e74e..bd0ec9f 100644 --- a/ocfs2_hb_ctl/Makefile +++ b/ocfs2_hb_ctl/Makefile @@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a -LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap +LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a ifndef OCFS2_DYNAMIC_CTL diff --git a/tunefs.ocfs2/Makefile b/tunefs.ocfs2/Makefile index 4e40d7d..332cfb0 100644 --- a/tunefs.ocfs2/Makefile +++ b/tunefs.ocfs2/Makefile @@ -11,7 +11,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS) LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a -LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap +LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a UNINST_LIBRARIES = libocfs2ne.a -- 1.8.1.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
