d37417e4c1
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
98 lines
3.7 KiB
Diff
98 lines
3.7 KiB
Diff
From 86a0abd01111e80803218cdae3348d2563fa2c1b Mon Sep 17 00:00:00 2001
|
|
From: Lidong Zhong <lzhong@suse.com>
|
|
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 <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
|
|
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
|
|
|