Accepting request 201629 from home:goldwynr:branches:network:ha-clustering:Factory
OBS-URL: https://build.opensuse.org/request/show/201629 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=71
This commit is contained in:
parent
392a2f99a9
commit
d37417e4c1
@ -1,7 +1,7 @@
|
|||||||
From 2d1b78517ff14633f4b1cf4adddf6308721f9722 Mon Sep 17 00:00:00 2001
|
From 2d1b78517ff14633f4b1cf4adddf6308721f9722 Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Mon, 19 Aug 2013 08:20:32 -0500
|
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 +----------------------------------------------------
|
libo2cb/o2cb_abi.c | 152 +----------------------------------------------------
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 40b1211091b62a4884d1625fc04d476a07489ca3 Mon Sep 17 00:00:00 2001
|
From 40b1211091b62a4884d1625fc04d476a07489ca3 Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Mon, 19 Aug 2013 08:38:59 -0500
|
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 +----------------------------------------------------
|
libo2cb/o2cb_abi.c | 388 +----------------------------------------------------
|
||||||
@ -9,8 +9,8 @@ Subject: [PATCH 2/7] libo2cb: Remove rest of controld functions
|
|||||||
|
|
||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c
|
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.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-08-23 22:52:20.143277130 -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 @@
|
@@ -46,7 +46,6 @@
|
||||||
#define CLUSTER_STACK_FILE "/sys/fs/ocfs2/cluster_stack"
|
#define CLUSTER_STACK_FILE "/sys/fs/ocfs2/cluster_stack"
|
||||||
#define LOCKING_PROTOCOL_FILE "/sys/fs/ocfs2/max_locking_protocol"
|
#define LOCKING_PROTOCOL_FILE "/sys/fs/ocfs2/max_locking_protocol"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 3f2b73105c5e09e17744ec249eed93c60124bd2d Mon Sep 17 00:00:00 2001
|
From 3f2b73105c5e09e17744ec249eed93c60124bd2d Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Mon, 19 Aug 2013 18:05:04 -0500
|
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 ++++++++++++++++++++
|
libo2cb/o2cb_abi.c | 20 ++++++++++++++++++++
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 394a3e7d2758331ba8aa6fc38957611d2447a73d Mon Sep 17 00:00:00 2001
|
From 394a3e7d2758331ba8aa6fc38957611d2447a73d Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Mon, 19 Aug 2013 19:15:53 -0500
|
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 ----------------------------------
|
debugfs.ocfs2/commands.c | 34 ----------------------------------
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 8563d603b7af2a32ef1e19337eaeb9d7cace730c Mon Sep 17 00:00:00 2001
|
From 8563d603b7af2a32ef1e19337eaeb9d7cace730c Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Mon, 19 Aug 2013 19:18:40 -0500
|
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
|
Since we just have to check if the DLM daemon is running, we
|
||||||
just check the kernel version running. Checking the kernel version
|
just check the kernel version running. Checking the kernel version
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 4adc4d242f3f69808e7e2bed71337ff7e7966846 Mon Sep 17 00:00:00 2001
|
From 4adc4d242f3f69808e7e2bed71337ff7e7966846 Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Mon, 19 Aug 2013 19:20:19 -0500
|
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 +-
|
fsck.ocfs2/Makefile | 2 +-
|
||||||
|
25
0007-Use-libdlm_lt.so.3-instead-of-libdlm_lt.so.patch
Normal file
25
0007-Use-libdlm_lt.so.3-instead-of-libdlm_lt.so.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From a1f08ff644b53da04f5cd450476ae3db6bc14583 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
|
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
|
||||||
|
|
@ -1,8 +1,8 @@
|
|||||||
From 5d0bffdbbadd38173a9bfbf4ffb8d455b5f0b990 Mon Sep 17 00:00:00 2001
|
From 5d0bffdbbadd38173a9bfbf4ffb8d455b5f0b990 Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Tue, 3 Sep 2013 07:40:39 -0500
|
Date: Tue, 3 Sep 2013 07:40:39 -0500
|
||||||
Subject: [PATCH 8/8] mount.ocfs2: Read stack from device and setup stack if
|
Subject: [PATCH] mount.ocfs2: Read stack from device and setup stack if not
|
||||||
not present
|
present
|
||||||
|
|
||||||
Note, this removes cman as the possible user stack.
|
Note, this removes cman as the possible user stack.
|
||||||
---
|
---
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 14c5f3788b047024390c1a1ae40a0585417ed0d9 Mon Sep 17 00:00:00 2001
|
From 14c5f3788b047024390c1a1ae40a0585417ed0d9 Mon Sep 17 00:00:00 2001
|
||||||
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
Date: Wed, 4 Sep 2013 23:56:39 -0500
|
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 +++++++++++++++----
|
mkfs.ocfs2/check.c | 19 +++++++++++++++----
|
||||||
|
@ -0,0 +1,32 @@
|
|||||||
|
From 007b8d8d784a4108d5bde3cf1d0f1289a73957fd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
||||||
|
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
|
||||||
|
|
@ -1,8 +1,24 @@
|
|||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile
|
From 86a0abd01111e80803218cdae3348d2563fa2c1b Mon Sep 17 00:00:00 2001
|
||||||
===================================================================
|
From: Lidong Zhong <lzhong@suse.com>
|
||||||
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/fsck.ocfs2/Makefile
|
Date: Tue, 1 Oct 2013 09:48:27 -0500
|
||||||
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile
|
Subject: [PATCH] Use dlm_lt instead of dlm for DLM libraries
|
||||||
@@ -12,7 +12,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo
|
|
||||||
|
References: bnc#838705
|
||||||
|
Signed-off-by: Lidong Zhong <lzhong@suse.com>
|
||||||
|
---
|
||||||
|
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
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
||||||
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
||||||
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
||||||
@ -11,10 +27,10 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile
|
|||||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||||
LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal
|
LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal
|
||||||
LIBTOOLS_INTERNAL_DEPS = $(TOPDIR)/libtools-internal/libtools-internal.a
|
LIBTOOLS_INTERNAL_DEPS = $(TOPDIR)/libtools-internal/libtools-internal.a
|
||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile
|
diff --git a/mkfs.ocfs2/Makefile b/mkfs.ocfs2/Makefile
|
||||||
===================================================================
|
index 1fed073..6840102 100644
|
||||||
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mkfs.ocfs2/Makefile
|
--- a/mkfs.ocfs2/Makefile
|
||||||
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile
|
+++ b/mkfs.ocfs2/Makefile
|
||||||
@@ -8,7 +8,7 @@ SBIN_PROGRAMS = mkfs.ocfs2
|
@@ -8,7 +8,7 @@ SBIN_PROGRAMS = mkfs.ocfs2
|
||||||
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
|
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
|
||||||
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
||||||
@ -24,11 +40,11 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile
|
|||||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||||
|
|
||||||
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile
|
diff --git a/mount.ocfs2/Makefile b/mount.ocfs2/Makefile
|
||||||
===================================================================
|
index 2736f5f..e42958e 100644
|
||||||
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mount.ocfs2/Makefile
|
--- a/mount.ocfs2/Makefile
|
||||||
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile
|
+++ b/mount.ocfs2/Makefile
|
||||||
@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo
|
@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
|
||||||
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
||||||
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
||||||
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
||||||
@ -37,11 +53,11 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile
|
|||||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||||
|
|
||||||
DEFINES = -DVERSION=\"$(VERSION)\"
|
DEFINES = -DVERSION=\"$(VERSION)\"
|
||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile
|
diff --git a/mounted.ocfs2/Makefile b/mounted.ocfs2/Makefile
|
||||||
===================================================================
|
index 3e18895..577216e 100644
|
||||||
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mounted.ocfs2/Makefile
|
--- a/mounted.ocfs2/Makefile
|
||||||
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile
|
+++ b/mounted.ocfs2/Makefile
|
||||||
@@ -8,7 +8,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/liboc
|
@@ -8,7 +8,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
||||||
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
||||||
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
||||||
|
|
||||||
@ -50,11 +66,11 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile
|
|||||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||||
|
|
||||||
LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal
|
LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal
|
||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile
|
diff --git a/ocfs2_hb_ctl/Makefile b/ocfs2_hb_ctl/Makefile
|
||||||
===================================================================
|
index d04e74e..bd0ec9f 100644
|
||||||
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/ocfs2_hb_ctl/Makefile
|
--- a/ocfs2_hb_ctl/Makefile
|
||||||
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile
|
+++ b/ocfs2_hb_ctl/Makefile
|
||||||
@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo
|
@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
|
||||||
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
||||||
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
||||||
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
||||||
@ -63,11 +79,11 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile
|
|||||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||||
|
|
||||||
ifndef OCFS2_DYNAMIC_CTL
|
ifndef OCFS2_DYNAMIC_CTL
|
||||||
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile
|
diff --git a/tunefs.ocfs2/Makefile b/tunefs.ocfs2/Makefile
|
||||||
===================================================================
|
index 4e40d7d..332cfb0 100644
|
||||||
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/tunefs.ocfs2/Makefile
|
--- a/tunefs.ocfs2/Makefile
|
||||||
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile
|
+++ b/tunefs.ocfs2/Makefile
|
||||||
@@ -11,7 +11,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/liboc
|
@@ -11,7 +11,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
||||||
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
||||||
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
||||||
|
|
||||||
@ -76,3 +92,6 @@ Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile
|
|||||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||||
|
|
||||||
UNINST_LIBRARIES = libocfs2ne.a
|
UNINST_LIBRARIES = libocfs2ne.a
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 1 15:07:57 UTC 2013 - rgoldwyn@suse.com
|
||||||
|
|
||||||
|
- 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.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 13 08:34:08 UTC 2013 - lmb@suse.com
|
Fri Sep 13 08:34:08 UTC 2013 - lmb@suse.com
|
||||||
|
|
||||||
@ -7,7 +14,7 @@ Fri Sep 13 08:34:08 UTC 2013 - lmb@suse.com
|
|||||||
Thu Sep 12 09:30:27 UTC 2013 - lzhong@suse.com
|
Thu Sep 12 09:30:27 UTC 2013 - lzhong@suse.com
|
||||||
|
|
||||||
- mkfs.ocfs2/tunefs.ocfs2 may hang there because of dlm_unlock
|
- mkfs.ocfs2/tunefs.ocfs2 may hang there because of dlm_unlock
|
||||||
+bug-838705-change_dlm_lib.patch
|
+ 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 5 07:24:42 CDT 2013 - rgoldwyn@suse.com
|
Thu Sep 5 07:24:42 CDT 2013 - rgoldwyn@suse.com
|
||||||
|
@ -55,7 +55,8 @@ Patch226: 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
|
|||||||
Patch227: 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
|
Patch227: 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
|
||||||
Patch228: 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.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
|
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: autoconf
|
||||||
BuildRequires: e2fsprogs-devel
|
BuildRequires: e2fsprogs-devel
|
||||||
@ -176,6 +177,7 @@ managing the file system.
|
|||||||
%patch228 -p1
|
%patch228 -p1
|
||||||
%patch229 -p1
|
%patch229 -p1
|
||||||
%patch230 -p1
|
%patch230 -p1
|
||||||
|
%patch231 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PROJECT="ocfs2-tools"
|
export PROJECT="ocfs2-tools"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user